diff options
Diffstat (limited to 'editors/gedit/patches')
| -rw-r--r-- | editors/gedit/patches/patch-aa | 8 | ||||
| -rw-r--r-- | editors/gedit/patches/patch-ab | 31 |
2 files changed, 4 insertions, 35 deletions
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa index e2a7be80036..d481a11cabf 100644 --- a/editors/gedit/patches/patch-aa +++ b/editors/gedit/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2008/09/30 08:04:30 hubertf Exp $ +$NetBSD: patch-aa,v 1.9 2009/01/12 21:50:17 wiz Exp $ ---- plugins/taglist/Makefile.in.orig 2008-09-19 04:57:38.000000000 +0200 +--- plugins/taglist/Makefile.in.orig 2009-01-10 18:45:20.000000000 +0100 +++ plugins/taglist/Makefile.in -@@ -138,6 +138,7 @@ GMSGFMT = @GMSGFMT@ +@@ -142,6 +142,7 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ GZIP = @GZIP@ @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.8 2008/09/30 08:04:30 hubertf Exp $ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ -@@ -650,7 +651,7 @@ uninstall-am: uninstall-pluginDATA unins +@@ -637,7 +638,7 @@ uninstall-am: uninstall-pluginDATA unins %.tags.gz: %.tags.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache diff --git a/editors/gedit/patches/patch-ab b/editors/gedit/patches/patch-ab deleted file mode 100644 index 0d42ca5963a..00000000000 --- a/editors/gedit/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2008/12/24 17:56:11 jmcneill Exp $ - ---- configure.ac.orig 2008-11-23 12:16:28.000000000 -0500 -+++ configure.ac 2008-12-24 12:48:29.000000000 -0500 -@@ -176,7 +176,6 @@ - dnl ================================================================ - - PKG_CHECK_MODULES(GEDIT, [ -- sm >= 1.0.0 - libxml-2.0 >= 2.5.0 - glib-2.0 >= 2.13.0 - gthread-2.0 >= 2.13.0 -@@ -189,6 +188,18 @@ - AC_SUBST(GEDIT_LIBS) - AC_SUBST(GEDIT_CFLAGS) - -+PKG_CHECK_MODULES(SM, sm >= $1.0.0, [HAVE_SM=yes], [HAVE_SM=no]) -+if test x$HAVE_SM = xno; then -+ AC_PATH_XTRA -+ if test "x$no_x" = xyes; then -+ AC_MSG_ERROR(X11 and sm development libraries not found); -+ else -+ XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS" -+ XLIB_CFLAGS=$X_CFLAGS -+ fi -+fi -+GEDIT_CFLAGS="$GEDIT_CFLAGS $SM_CFLAGS $XLIB_CFLAGS" -+GEDIT_LIBS="$GEDIT_LIBS $SM_LIBS $XLIB_LIBS" - - dnl ================================================================ - dnl GConf related settings |