Ticket #52545: patch-keybinder-0.3.1-diff

File patch-keybinder-0.3.1-diff, 6.1 KB (added by dbevans (David B. Evans), 8 years ago)

Patch for all issues except adding a new keybiinder-3.0 port

Line 
1Index: Portfile
2===================================================================
3--- Portfile    (revision 153825)
4+++ Portfile    (working copy)
5@@ -5,8 +5,7 @@
6 PortGroup           github 1.0
7 PortGroup           gobject_introspection 1.0
8 
9-github.setup        engla keybinder 0.3.0 v
10-revision            1
11+github.setup        engla keybinder 0.3.1 v
12 categories          gnome devel
13 platforms           darwin
14 maintainers         ryandesign openmaintainer
15@@ -15,20 +14,26 @@
16 description         library for global keyboard shortcuts in GTK applications
17 
18 long_description    ${name} is a library for registering global keyboard \
19-                    shortcuts in GTK-based applications using the X Window \
20+                    shortcuts in GTK2-based applications using the X Window \
21                     System.
22 
23-master_sites        http://kaizer.se/publicfiles/keybinder/
24+checksums           rmd160  5540b349f193c49413e5e443c40dec2291a715c9 \
25+                    sha256  3c4636965a228902ef70fb8df34e3cc11036b82c2c3be45819d0780f34345b7b
26 
27-checksums           rmd160  2f2e25860fa116f7872bbdb2850b75e3e43958cf \
28-                    sha256  42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb
29+depends_build       port:pkgconfig \
30+                    port:autoconf \
31+                    port:automake \
32+                    port:libtool \
33+                    port:gnome-common \
34+                    port:gtk-doc
35 
36-depends_build       port:pkgconfig
37-
38 depends_lib         port:gtk2
39 
40-patchfiles          patch_python-keybinder_Makefile.in.diff
41+patchfiles          patch-configure.ac.diff \
42+                    patch_python-keybinder_Makefile.am.diff
43 
44+configure.cmd       ./autogen.sh
45+
46 configure.args      --disable-silent-rules \
47                     --disable-gtk-doc \
48                     --disable-lua
49@@ -38,7 +43,7 @@
50     gobject_introspection yes
51 }
52 
53-set python.versions {26 27}
54+set python.versions {27}
55 
56 foreach v ${python.versions} {
57     set python.version  ${v}
58@@ -49,10 +54,11 @@
59     subport py${python.version}-keybinder {
60         depends_lib-append      port:${name} \
61                                 port:python${python.version} \
62+                                port:py${python.version}-gobject \
63                                 port:py${python.version}-pygtk
64 
65         configure.args-append   --enable-python \
66-                                ac_cv_path_PYGTK_CODEGEN=${prefix}/bin/pygtk-codegen-2.0-${python.branch}
67+                                PYGOBJECT_CODEGEN=${python.prefix}/bin/pygtk-codegen-2.0
68 
69         configure.python        ${python.bin}
70         configure.pkg_config_path   ${python.prefix}/lib/pkgconfig
71Index: files/patch-configure.ac.diff
72===================================================================
73--- files/patch-configure.ac.diff       (nonexistent)
74+++ files/patch-configure.ac.diff       (working copy)
75@@ -0,0 +1,32 @@
76+--- configure.ac.orig  2016-10-12 11:42:01.000000000 -0700
77++++ configure.ac       2016-10-12 11:47:28.000000000 -0700
78+@@ -21,7 +21,9 @@
79+ AC_SUBST(LT_REVISION)
80+ AC_SUBST(LT_AGE)
81+
82+-GNOME_COMMON_INIT
83++dnl long deprecated GNOME_COMMON_INIT removed in gnome-common 3.18.0
84++dnl https://git.gnome.org/browse/gnome-common/commit/?id=6684e2fa5d5a4c72c9bf116f74688c0b47f350cf
85++dnl GNOME_COMMON_INIT
86+
87+ AM_MAINTAINER_MODE
88+ AM_DISABLE_STATIC
89+@@ -115,6 +117,18 @@
90+       dnl ****************************************************************************
91+       have_python="yes"
92+       AM_PATH_PYTHON(2.5)
93++
94++      dnl Override standard python locations with MacPorts version specific ones
95++
96++      AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
97++      AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
98++
99++      am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
100++      am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
101++
102++      AC_SUBST([pythondir], [$am_cv_python_pythondir])
103++      AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
104++
105+       AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
106+
107+       PKG_CHECK_MODULES(PYGTK,
108Index: files/patch_python-keybinder_Makefile.am.diff
109===================================================================
110--- files/patch_python-keybinder_Makefile.am.diff       (nonexistent)
111+++ files/patch_python-keybinder_Makefile.am.diff       (working copy)
112@@ -0,0 +1,11 @@
113+--- python-keybinder/Makefile.am.orig  2015-11-06 07:08:46.000000000 -0800
114++++ python-keybinder/Makefile.am       2016-10-12 08:08:43.000000000 -0700
115+@@ -6,7 +6,7 @@
116+ _keybinder_LTLIBRARIES = _keybinder.la
117+ _keybinder_la_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(PYEXTRAFLAGS)
118+ _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder $(X_LDFLAGS)
119+-_keybinder_la_LIBADD = ../libkeybinder/libkeybinder.la $(PYGTK_LIBS)
120++_keybinder_la_LIBADD = $(LIBDIR)/libkeybinder.dylib $(PYGTK_LIBS)
121+ _keybinder_la_SOURCES = _keybindermodule.c
122+
123+ nodist__keybinder_la_SOURCES = _keybinder.c
124Index: files/patch_python-keybinder_Makefile.in.diff
125===================================================================
126--- files/patch_python-keybinder_Makefile.in.diff       (revision 153825)
127+++ files/patch_python-keybinder_Makefile.in.diff       (nonexistent)
128@@ -1,20 +0,0 @@
129---- python-keybinder/Makefile.in.orig  2012-06-17 11:25:51.000000000 -0500
130-+++ python-keybinder/Makefile.in       2013-12-09 09:34:22.000000000 -0600
131-@@ -97,7 +97,7 @@
132-       "$(DESTDIR)$(_keybinderdir)"
133- LTLIBRARIES = $(_keybinder_LTLIBRARIES)
134- am__DEPENDENCIES_1 =
135--_keybinder_la_DEPENDENCIES = ../libkeybinder/libkeybinder.la \
136-+_keybinder_la_DEPENDENCIES = $(LIBDIR)/libkeybinder.dylib \
137-       $(am__DEPENDENCIES_1)
138- am__keybinder_la_OBJECTS = _keybinder_la-_keybindermodule.lo
139- nodist__keybinder_la_OBJECTS = _keybinder_la-_keybinder.lo
140-@@ -314,7 +314,7 @@
141- _keybinder_LTLIBRARIES = _keybinder.la
142- _keybinder_la_CPPFLAGS = $(X_CFLAGS) $(PYEXTRAFLAGS)
143- _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder $(X_LDFLAGS)
144--_keybinder_la_LIBADD = ../libkeybinder/libkeybinder.la $(PYGTK_LIBS)
145-+_keybinder_la_LIBADD = $(LIBDIR)/libkeybinder.dylib $(PYGTK_LIBS)
146- _keybinder_la_SOURCES = _keybindermodule.c
147- nodist__keybinder_la_SOURCES = _keybinder.c
148- _keybinder_PYTHON = \