summaryrefslogtreecommitdiff
path: root/app-text/glosung/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
commitd87262dd706fec50cd150aab3e93883b6337466d (patch)
tree246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-text/glosung/files
parent71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-text/glosung/files')
-rw-r--r--app-text/glosung/files/glosung-3.6.2-glib-includes.patch11
-rw-r--r--app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch63
-rw-r--r--app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch64
-rw-r--r--app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch61
-rw-r--r--app-text/glosung/files/glosung.desktop12
5 files changed, 0 insertions, 211 deletions
diff --git a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
deleted file mode 100644
index 715b201ca64f..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN glosung-3.6.2/src/losung.c glosung-3.6.2-patched/src/losung.c
---- glosung-3.6.2/src/losung.c 2010-01-04 15:28:38.000000000 -0500
-+++ glosung-3.6.2-patched/src/losung.c 2013-01-21 14:34:14.318711560 -0500
-@@ -31,7 +31,6 @@
- #endif /* WIN32 */
-
- #include <glib/gi18n.h>
--#include <glib/goption.h>
-
- #include "util.h"
-
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
deleted file mode 100644
index 0f4ac73a06bd..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -17,6 +17,7 @@
-
-
- import os
-+import SCons.Util
-
- version = '3.6.2'
-
-@@ -32,14 +33,22 @@
- (this option is only for packaging)''')
-
- env = Environment (
-- LINK = 'gcc',
-- CC = 'gcc',
- CPPPATH = '',
- LINKFLAGS = '',
- CCFLAGS = '',
- ENV = os.environ,
- TARFLAGS = '-c -j')
-
-+if os.environ.has_key('CC'):
-+ env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+ env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-
- if env['PLATFORM'] == 'win32':
- prefix = ARGUMENTS.get ('PREFIX', '')
-@@ -58,7 +68,7 @@
- BuildDir ('build', 'src')
-
- cpppath = ['#', '#build']
--ccflags = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
-+ccflags = ['-std=c99',
- # '-DLIBXML_STATIC',
- '-DVERSION=\\"' + version + '\\"',
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
-@@ -74,7 +74,7 @@
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
-
--linkflags = ['-Wl,--export-dynamic', '-L.']
-+linkflags = []
- # -L/usr/lib'
- # `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
-
-@@ -83,9 +83,6 @@
- ccflags.append ('-pg', '-fprofile-arcs')
- linkflags.append ('-pg', '-fprofile-arcs')
-
--if env['PLATFORM'] != 'win32':
-- linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
- ccflags += [
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
deleted file mode 100644
index 15c12bf94888..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -17,6 +17,7 @@
-
-
- import os
-+import SCons.Util
-
- version = '3.6.2'
-
-@@ -32,14 +33,23 @@
- (this option is only for packaging)''')
-
- env = Environment (
-- LINK = 'gcc',
-- CC = 'gcc',
-+ CC = '',
- CPPPATH = '',
- LINKFLAGS = '',
- CCFLAGS = '',
- ENV = os.environ,
- TARFLAGS = '-c -j')
-
-+if os.environ.has_key('CC'):
-+ env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+ env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-
- if env['PLATFORM'] == 'win32':
- prefix = ARGUMENTS.get ('PREFIX', '')
-@@ -58,7 +68,7 @@
- BuildDir ('build', 'src')
-
- cpppath = ['#', '#build']
--ccflags = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
-+ccflags = ['-std=c99',
- # '-DLIBXML_STATIC',
- '-DVERSION=\\"' + version + '\\"',
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
-@@ -74,7 +74,7 @@
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
-
--linkflags = ['-Wl,--export-dynamic', '-L.']
-+linkflags = []
- # -L/usr/lib'
- # `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
-
-@@ -83,9 +83,6 @@
- ccflags.append ('-pg', '-fprofile-arcs')
- linkflags.append ('-pg', '-fprofile-arcs')
-
--if env['PLATFORM'] != 'win32':
-- linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
- ccflags += [
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
deleted file mode 100644
index 9adece925b19..000000000000
--- a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
---- glosung-3.6.4-original/SConstruct 2016-01-22 22:11:00.785053522 -0500
-+++ glosung-3.6.4/SConstruct 2016-01-22 22:14:04.434058592 -0500
-@@ -17,6 +17,7 @@
-
-
- import os
-+import SCons.Util
-
- version = '3.6.4'
-
-@@ -32,14 +33,23 @@
- (this option is only for packaging)''')
-
- env = Environment (
-- LINK = 'gcc',
-- CC = 'gcc',
- CPPPATH = '',
- LINKFLAGS = '',
- CCFLAGS = '',
- ENV = os.environ,
- TARFLAGS = '-c -j')
-
-+if os.environ.has_key('CC'):
-+ env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+ env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
- if env['PLATFORM'] == 'win32':
- prefix = ARGUMENTS.get ('PREFIX', '')
- install_dir = ARGUMENTS.get ('DESTDIR', '')
-@@ -57,21 +67,18 @@
- VariantDir('build', 'src')
-
- cpppath = ['#', '#build']
--ccflags = ['-O2', '-std=c99', '-Wall', '-g',
-+ccflags = ['-std=c99',
- # '-DLIBXML_STATIC',
- '-DVERSION=\\"' + version + '\\"',
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
-
--linkflags = ['-L.']
-+linkflags = []
-
- if ARGUMENTS.get ('profile'):
- ccflags.append ('-pg', '-fprofile-arcs')
- linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
-
--if env['PLATFORM'] != 'win32':
-- linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
- ccflags += [
diff --git a/app-text/glosung/files/glosung.desktop b/app-text/glosung/files/glosung.desktop
deleted file mode 100644
index 7372b0f47123..000000000000
--- a/app-text/glosung/files/glosung.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=GLosung - Herrnhut's Watchwords
-Name[de]=GLosung - Herrnhuter Losungen
-Name[hu]=GLosung - Herrnhuter-i Útmutató
-Comment=Gods Word for every day
-Comment[de]=Gottes Wort für jeden Tag
-Comment[hu]=Isten igéje minden napra
-Exec=glosung
-Icon=/usr/share/glosung/glosung.png
-Terminal=false
-Type=Application
-Categories=Utility;X-Red-Hat-Extra;Spirituality;