diff options
Diffstat (limited to 'net-im/gajim-devel/files')
-rw-r--r-- | net-im/gajim-devel/files/patch-Makefile | 50 | ||||
-rw-r--r-- | net-im/gajim-devel/files/patch-common_Makefile | 10 | ||||
-rw-r--r-- | net-im/gajim-devel/files/patch-common_setup.py | 11 | ||||
-rw-r--r-- | net-im/gajim-devel/files/patch-plugins_gtkui_Makefile | 9 |
4 files changed, 80 insertions, 0 deletions
diff --git a/net-im/gajim-devel/files/patch-Makefile b/net-im/gajim-devel/files/patch-Makefile new file mode 100644 index 000000000000..5f0dbfa14a17 --- /dev/null +++ b/net-im/gajim-devel/files/patch-Makefile @@ -0,0 +1,50 @@ +--- Makefile.orig Sun Apr 3 14:40:02 2005 ++++ Makefile Thu Apr 28 16:13:52 2005 +@@ -1,16 +1,21 @@ + VERSION ?= 0.6.1 + + MODULES = common plugins/gtkgui +-PREFIX = /usr ++PREFIX ?= /usr/local + DESTDIR = / ++MAKE ?= gmake + +-FIND = find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)' +-FILES = `$(FIND)` +-DIRS = `$(FIND) -exec dirname {} \; | sort -u` +-FIND_LIB = find -regex '.*\.\(so\)' ++FIND = find -E ++FINDOPTS = -regex '.*.((glade)|(py)|(xpm)|(gif)|(png)|(mo)|(wav))' ++FILES = `$(FIND) . $(FINDOPTS)` ++DIRS = `$(FIND) . $(FINDOPTS) -exec dirname {} \; | sort -u` ++FIND_LIB = $(FIND) . -regex '.*.(so)' + FILES_LIB = `$(FIND_LIB)` + + LANGS = fr pt_BR ++GTK_CFLAGS = `pkg-config gtk+-2.0 --cflags-only-I | sed -e 's/-I/:/g' | tr -d ' '` ++GTK_LDFLAGS = `pkg-config gtk+-2.0 --libs-only-L | sed -e 's/-L/:/g' | tr -d ' '` ++ + SCRIPTS = \ + scripts/gajim + +@@ -22,15 +27,15 @@ + done + + trayicon: +- make -C plugins/gtkgui all; ++ $(MAKE) -C plugins/gtkgui all; + + idle: +- make -C common all; ++ $(MAKE) -C common all GTK_LDFLAGS="$(GTK_LDFLAGS)" GTK_CFLAGS="$(GTK_CFLAGS)"; + + clean: +- find -name *.pyc -exec rm {} \; +- find -name *.mo -exec rm {} \; +- $(foreach sdir, $(MODULES), make -C $(sdir) clean;) ++ find . -name *.pyc -exec rm {} \; ++ find . -name *.mo -exec rm {} \; ++ $(foreach sdir, $(MODULES), $(MAKE) -C $(sdir) clean;) + + # FIXME -- olé gorito + dist: diff --git a/net-im/gajim-devel/files/patch-common_Makefile b/net-im/gajim-devel/files/patch-common_Makefile new file mode 100644 index 000000000000..d17d3c1db42b --- /dev/null +++ b/net-im/gajim-devel/files/patch-common_Makefile @@ -0,0 +1,10 @@ +--- common/Makefile.orig Sun Apr 3 14:40:00 2005 ++++ common/Makefile Thu Apr 28 15:36:14 2005 +@@ -1,5 +1,6 @@ ++ + all: +- python setup.py build_ext -i ++ python setup.py build_ext --include-dirs="$(PREFIX)/include$(GTK_CFLAGS)" --library-dirs="$(PREFIX)/lib$(GTK_LDFLAGS)" + + clean: + rm -f *.so diff --git a/net-im/gajim-devel/files/patch-common_setup.py b/net-im/gajim-devel/files/patch-common_setup.py new file mode 100644 index 000000000000..9dcb724b9ba4 --- /dev/null +++ b/net-im/gajim-devel/files/patch-common_setup.py @@ -0,0 +1,11 @@ +--- common/setup.py.orig Sun Apr 3 14:40:00 2005 ++++ common/setup.py Thu Apr 28 00:56:41 2005 +@@ -24,8 +24,6 @@ + sources = ['idle.c'], + # extra_compile_args = ['-W'], + libraries = ['gtk-x11-2.0','gdk-x11-2.0','glib-2.0','X11','Xext','Xss','atk-1.0'], +- library_dirs = ['/usr/X11R6/lib'], +- include_dirs = ['/usr/include/gtk-2.0', '/usr/include/glib-2.0','/usr/lib/gtk-2.0/include','/usr/lib/glib-2.0/include','/usr/include/pango-1.0','/usr/include/atk-1.0'] + ) + elif os.name == 'nt': + module1 = Extension( 'idle', diff --git a/net-im/gajim-devel/files/patch-plugins_gtkui_Makefile b/net-im/gajim-devel/files/patch-plugins_gtkui_Makefile new file mode 100644 index 000000000000..5152f4508459 --- /dev/null +++ b/net-im/gajim-devel/files/patch-plugins_gtkui_Makefile @@ -0,0 +1,9 @@ +--- plugins/gtkgui/Makefile.orig Wed Apr 27 22:53:16 2005 ++++ plugins/gtkgui/Makefile Wed Apr 27 22:54:13 2005 +@@ -1,5 +1,5 @@ + # Set the C flags to include the GTK+ and Python libraries +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.4/ -I. ++CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` $(PY_CFLAGS) -I. + LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` + + # Build the shared object |