Fix compilation of geany-plugins-0.20 against geany-0.21 with patch pulled from upstr...

Package-Manager: portage-2.2.0_alpha67-r1/cvs/Linux x86_64

diff --git a/dev-util/geany-plugins/ChangeLog b/dev-util/geany-plugins/ChangeLog
index c72d2de0f67cf8127a6b20b09f6f04d8cc9a4550..54c9daa815e161ca5d1441579e0f02616b76169a 100644 (file)
--- a/dev-util/geany-plugins/ChangeLog
+++ b/dev-util/geany-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/geany-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/ChangeLog,v 1.7 2011/05/04 23:36:26 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/ChangeLog,v 1.8 2011/10/15 23:33:07 binki Exp $
+
+  15 Oct 2011; Nathan Phillip Brink <binki@gentoo.org>
+  geany-plugins-0.20-r1.ebuild, +files/geany-plugins-0.20-config.h.patch:
+  Fix compilation of geany-plugins-0.20 against geany-0.21 with patch pulled
+  from upstream commits. Update dependency to reflect compatibility with
+  geany-0.21.
 
   04 May 2011; Nathan Phillip Brink <binki@gentoo.org> metadata.xml:
   Take over geany-plugins which used to be proxy maintained for me.

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 1c3b5c378dd166c45563b5f391f404dceb5d1519..9929df5383797c5dfb4fb74ac0a12abbbeaf5172 100644 (file)
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,19 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX geany-plugins-0.20-config.h.patch 8064 RMD160 e9c99042aceb77ef9567ae03468769fb2503783d SHA1 2680569863614c9f8d6114b41e2ce26c13f21e19 SHA256 13b0b635971a21a3da80cd042b75a838704bcf35d783527c74b173424e12c22a
 AUX geany-plugins-0.20-geanyprj-outsrc-tests.patch 612 RMD160 21a5756db9ed0a8119fbcbe78ce9e12c8c74729b SHA1 5c13075df26262510cd92d577353a2903c5fc69b SHA256 43fc3d52aa789557f0e6c4def99f51d2b7516f90923809db31bb9be455a63071
 DIST geany-plugins-0.19.tar.gz 1331968 RMD160 453ecc1f305651cd3e6ed4e128065faeed7722c9 SHA1 7a498ccdf324da7a69247a53d951fd796f34eace SHA256 c006b6d19e81d7b3dff1bfe8faf75cf7a7fced0ec59829313bcc764ad27994bc
 DIST geany-plugins-0.20.tar.gz 1463482 RMD160 30d00fd9135609df76dca3813f1bbea4c3000390 SHA1 adadeb24854141bcdbe7facb9bc05080ddb23899 SHA256 c5ce25880e1943536dc07659644fdc7e23736873d9a518e45b021458cc2570a8
 EBUILD geany-plugins-0.19.ebuild 905 RMD160 6725b1b02089d464946fc52810f59046a06fe423 SHA1 254ac4cd3be2394ba6b22d00bfa87fb6fc6c34fb SHA256 eb88595690fa7b8a3f54753510229fb02fda0586b269907b6527a89b8d40954e
-EBUILD geany-plugins-0.20-r1.ebuild 1522 RMD160 3d3c6307ec5fbb1ab9a10f758fdd250f2acf1335 SHA1 43c6f22c4ff101e1df5204f21b344679742f4796 SHA256 0f82b9dd12a8c00bb1cad79aa8a4e56e5e81e7e313cc82933895a03189bd45ad
-MISC ChangeLog 1445 RMD160 6ef23b7d7439753d6f22d37a9af4f6702f8cf007 SHA1 12eac86aa9de4d878c7015b326784439e49374e0 SHA256 ce5b764923bf10a145ac600c6cc334036fd870b616c65f02d9390a5fe9f5b0d0
+EBUILD geany-plugins-0.20-r1.ebuild 1663 RMD160 2a3fbc522b0a3fda2c651a54bdfc8569b9e723ad SHA1 d33ab9d6960383095e8420db0b044872dab31440 SHA256 4e39705e38a39aecb47da0b57a253a6b4f2b4803dd779ac6c47aeb6ee67e653e
+MISC ChangeLog 1739 RMD160 09f41e7e7790b249e9700c7ab46225d6c49091b6 SHA1 90019384e23c828ce268f8a3cd0a00e9a36243a9 SHA256 5865578f31aecf185b324e3b1d2fc62f09c1f978d268b6c6a2d2c1067b143662
 MISC metadata.xml 577 RMD160 cc3a457d4a8e7015bcb972c7e0fdd5db5804a7db SHA1 f637bc7e37ad5bf58098521cdb84a05350fd2519 SHA256 90deeb48aa983f983dd2a2a0abcc5484abc6f2f1a38d7b0ef4d11bf55372a54a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m4UACgkQfXuS5UK5QB2PkwP/UxbFQQWtstySnNZ7w6EwRWmi
-F3oFWg2x7v3qL9JoOKitvlRso6In0eCR7c54UhvKpVYw4elOLptipL1HTcO4JgcC
-VF9MaQxxBaChu1hzr1yMGq7mXJ2VOPBM32/1rpohxOS2Ym924lPbMZtxFR1o/R2a
-+ErOwBfezcodu3uuE0g=
-=t97i
+iQIcBAEBCAAGBQJOmhlLAAoJEHQ6UuhrqBBQZrQQAKBgIs2pUW7dM/FfMMWkqi9q
+b+mgZgPjeqyk+W1BDmW4iL8Nx85xXfEgyu/Clr0CvSN5RBhZgZrygxiW2VydpS0E
+T/FbcRKQZ0qSpno+8H/ytkJyIQAbJ/V/1KHYpdkq4Z/kghPoJY1P0HvXY4a+/qv0
+ndxuYoo594Q6ZLhRIcc4ZAZswfGXrwX9SK8avFyXxs6qkBbp0f36Cp9t/sRBHX6f
+8k9Hfm2sZkYF3BD+lGZmqbuwws+eoYyZJdmBsAymd/62v17obf2BSUn+epXM2KuR
+x3N8k6DNqXEhILmsNfBP2fl9qs6lAOWkC5mWpjRZxcTnKnaKJC5yIvJjUSQCBfaJ
+3QOnmjIFQZJm2dRCKEEsHrP9LmhMIhrIj6T5FunZycviUXmnnG4/u2Rtz5eieKyX
+YR8zGJ3kCJjQxlcp5V3BHiG4EsDAzelGGu5dj+Srfl99D53yAjLBtBewvnyuLFLK
+sIb52yyQRDQCXB9EyqOe9PBH5VILFX+8gmQv+iGcFND9ryTg5hzZBKEztVrelPz8
+TQRad7e06EJi8A/0sSPVZgmDQQAu4Z2QF/cIWLlowR3t7eNzfNoIwgTtbFKMNLaj
+IMRmXC0MzVAqA3FKRNl6lYrQ6/hWI7WiSi14tJJdfLnJSbvmjQznfAusRtvQHzHm
+NdeRIGC5u/tA5k+wwtyP
+=4KG5
 -----END PGP SIGNATURE-----

diff --git a/dev-util/geany-plugins/files/geany-plugins-0.20-config.h.patch b/dev-util/geany-plugins/files/geany-plugins-0.20-config.h.patch
new file mode 100644 (file)
index 0000000..aaf8e0b
--- /dev/null
+++ b/dev-util/geany-plugins/files/geany-plugins-0.20-config.h.patch
@@ -0,0 +1,278 @@
+------------------------------------------------------------------------
+r2133 | frlan | 2011-08-13 22:09:16 +0000 (Sat, 13 Aug 2011) | 1 line
+
+GeanyLaTeX: Fix build of plugin due to not properly included config.h
+------------------------------------------------------------------------
+Index: geanylatex/src/geanylatex.c
+===================================================================
+--- geanylatex/src/geanylatex.c        (revision 2132)
++++ geanylatex/src/geanylatex.c        (revision 2133)
+@@ -25,6 +25,11 @@
+ /* LaTeX plugin */
+ /* This plugin improves the work with LaTeX and Geany.*/
+ 
++
++#ifdef HAVE_CONFIG_H
++# include "config.h" /* for the gettext domain */
++#endif
++
+ #include "geanylatex.h"
+ #include "ctype.h"
+ 
+------------------------------------------------------------------------
+r2135 | frlan | 2011-08-13 22:10:02 +0000 (Sat, 13 Aug 2011) | 1 line
+
+Fix build of geanylipsum plugin due to not properly included config.h
+------------------------------------------------------------------------
+Index: geanylipsum/src/geanylipsum.c
+===================================================================
+--- geanylipsum/src/geanylipsum.c      (revision 2134)
++++ geanylipsum/src/geanylipsum.c      (revision 2135)
+@@ -20,6 +20,10 @@
+ 
+ #include "geanyplugin.h"
+ 
++#ifdef HAVE_CONFIG_H
++      #include "config.h" /* for the gettext domain */
++#endif
++
+ #include <string.h>
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
+------------------------------------------------------------------------
+r2136 | frlan | 2011-08-13 22:10:30 +0000 (Sat, 13 Aug 2011) | 1 line
+
+Fix build of geanysendmail plugin due to not properly included config.h
+------------------------------------------------------------------------
+Index: geanysendmail/src/geanysendmail.c
+===================================================================
+--- geanysendmail/src/geanysendmail.c  (revision 2135)
++++ geanysendmail/src/geanysendmail.c  (revision 2136)
+@@ -26,6 +26,9 @@
+ #include "geanyplugin.h"
+ #include "icon.h"
+ 
++#ifdef HAVE_CONFIG_H
++      #include "config.h" /* for the gettext domain */
++#endif
+ 
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
+------------------------------------------------------------------------
+r2137 | frlan | 2011-08-13 22:15:21 +0000 (Sat, 13 Aug 2011) | 1 line
+
+Fix build of updatechecker and tableconvert due to not properly included config.h
+------------------------------------------------------------------------
+Index: updatechecker/src/updatechecker.c
+===================================================================
+--- updatechecker/src/updatechecker.c  (revision 2136)
++++ updatechecker/src/updatechecker.c  (revision 2137)
+@@ -24,6 +24,11 @@
+ #include "libsoup/soup.h"
+ #include "stdlib.h"
+ 
++#ifdef HAVE_CONFIG_H
++      #include "config.h" /* for the gettext domain */
++#endif
++
++
+ GeanyPlugin     *geany_plugin;
+ GeanyData       *geany_data;
+ GeanyFunctions  *geany_functions;
+------------------------------------------------------------------------
+r2138 | eht16 | 2011-08-14 10:03:52 +0000 (Sun, 14 Aug 2011) | 1 line
+
+Move include of config.h to the top
+------------------------------------------------------------------------
+Index: addons/src/addons.c
+===================================================================
+--- addons/src/addons.c        (revision 2137)
++++ addons/src/addons.c        (revision 2138)
+@@ -22,5 +22,9 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include "geanyplugin.h"
+ 
+------------------------------------------------------------------------
+r2139 | eht16 | 2011-08-14 10:19:27 +0000 (Sun, 14 Aug 2011) | 1 line
+
+Properly include config.h as needed (after the implicit has been correctly removed from Geany's core)
+------------------------------------------------------------------------
+Index: geanyprj/src/geanyprj.c
+===================================================================
+--- geanyprj/src/geanyprj.c    (revision 2138)
++++ geanyprj/src/geanyprj.c    (revision 2139)
+@@ -20,6 +20,10 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <sys/time.h>
+ #include <string.h>
+ 
+===================================================================
+===================================================================
+--- treebrowser/src/treebrowser.c      (revision 2138)
++++ treebrowser/src/treebrowser.c      (revision 2139)
+@@ -4,6 +4,10 @@
+  *      Copyright 2010 Adrian Dimitrov <dimitrov.adrian@gmail.com>
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <string.h>
+===================================================================
+--- geanylua/geanylua.c        (revision 2138)
++++ geanylua/geanylua.c        (revision 2139)
+@@ -30,7 +30,11 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
+ 
++
+ #include "geany.h"
+ #include "plugindata.h"
+ #include "keybindings.h"
+===================================================================
+--- geanylua/glspi.h   (revision 2138)
++++ geanylua/glspi.h   (revision 2139)
+@@ -6,6 +6,10 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <lua.h>
+ #include <lualib.h>
+ #include <lauxlib.h>
+===================================================================
+--- geanyinsertnum/src/insertnum.c     (revision 2138)
++++ geanyinsertnum/src/insertnum.c     (revision 2139)
+@@ -17,6 +17,10 @@
+  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <ctype.h>
+ #include <limits.h>
+ #include <stdlib.h>
+===================================================================
+===================================================================
+--- geanygdb/src/gdb-io-stack.c        (revision 2138)
++++ geanygdb/src/gdb-io-stack.c        (revision 2139)
+@@ -17,6 +17,10 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <string.h>
+ #include <glib.h>
+ 
+===================================================================
+--- geanygdb/src/geanygdb.c    (revision 2138)
++++ geanygdb/src/geanygdb.c    (revision 2139)
+@@ -20,6 +20,10 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <glib/gstdio.h>
+ 
+ #include "geanyplugin.h"
+===================================================================
+--- geanygdb/src/gdb-ui-main.c (revision 2138)
++++ geanygdb/src/gdb-ui-main.c (revision 2139)
+@@ -18,6 +18,10 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+===================================================================
+===================================================================
+--- shiftcolumn/src/shiftcolumn.c      (revision 2138)
++++ shiftcolumn/src/shiftcolumn.c      (revision 2139)
+@@ -19,6 +19,10 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include "geany.h"
+ #include "support.h"
+ 
+===================================================================
+--- pretty-printer/src/PrettyPrinter.h (revision 2138)
++++ pretty-printer/src/PrettyPrinter.h (revision 2139)
+@@ -21,6 +21,10 @@
+ 
+ //========================================== INCLUDES ==========================================================
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+===================================================================
+--- geanyextrasel/src/extrasel.c       (revision 2138)
++++ geanyextrasel/src/extrasel.c       (revision 2139)
+@@ -17,6 +17,10 @@
+  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <gdk/gdkkeysyms.h>
+ 
+ #include "geanyplugin.h"
+===================================================================
+--- spellcheck/src/scplugin.c  (revision 2138)
++++ spellcheck/src/scplugin.c  (revision 2139)
+@@ -23,6 +23,10 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include "geanyplugin.h"
+ 
+ 

diff --git a/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild b/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild
index d3f5620e4836553d265f42c928fe713d5faaa907..e4abcf1b6963972421894d77f114581836c09181 100644 (file)
--- a/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild,v 1.2 2011/02/25 21:13:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild,v 1.3 2011/10/15 23:33:07 binki Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ IUSE="enchant gtkspell lua nls soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
 
-RDEPEND="=dev-util/geany-$(get_version_component_range 1-2)*
+RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
        dev-libs/libxml2:2
        dev-libs/glib:2
        enchant? ( app-text/enchant )
@@ -37,6 +37,10 @@ src_prepare() {
        # https://sourceforge.net/tracker/?func=detail&aid=3163117&group_id=222729&atid=1056532
        epatch "${FILESDIR}"/${P}-geanyprj-outsrc-tests.patch
 
+       # geany-0.21 doesn't have #include <config.h> in its geanyplugin.h,
+       # breaking <=geany-plugins-0.20.
+       epatch "${FILESDIR}"/${P}-config.h.patch
+
        eautomake
 }