Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8720
Modified Files:
gnotepad+.info gnotepad+.patch
Log Message:
cleanup for GNOME2.28
Index: gnotepad+.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/gnotepad+.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnotepad+.patch 15 Feb 2009 23:21:20 -0000 1.1
+++ gnotepad+.patch 25 May 2010 23:01:59 -0000 1.2
@@ -49,6 +49,18 @@
$gtk_config_major_version, $gtk_config_minor_version,
$gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
+diff -Nurd -x'*~' gnotepad+-1.3.3.orig/src/Makefile.in
gnotepad+-1.3.3/src/Makefile.in
+--- gnotepad+-1.3.3.orig/src/Makefile.in 2001-01-01 13:39:30.000000000
-0500
++++ gnotepad+-1.3.3/src/Makefile.in 2010-05-25 18:50:47.000000000 -0400
+@@ -127,7 +127,7 @@
+ misc.o msgbar.o msgbox.o prefs.o prefs_noglade.o prefs_nognome.o \
+ print.o prjbar.o project.o recent.o randomtips.o search.o shellcmd.o \
+ srcctrl.o toolbar.o undo.o win.o
+-gnp_LDADD = $(LDADD)
++gnp_LDADD = $(LDADD) $(INTLLIBS)
+ gnp_DEPENDENCIES =
+ gnp_LDFLAGS =
+ CFLAGS = @CFLAGS@
diff -Nurd -x'*~' gnotepad+-1.3.3.orig/src/gtkefilesel.c
gnotepad+-1.3.3/src/gtkefilesel.c
--- gnotepad+-1.3.3.orig/src/gtkefilesel.c 2000-03-14 02:17:52.000000000
-0500
+++ gnotepad+-1.3.3/src/gtkefilesel.c 2009-02-15 17:00:19.000000000 -0500
Index: gnotepad+.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/gnotepad+.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gnotepad+.info 15 Feb 2009 23:21:20 -0000 1.4
+++ gnotepad+.info 25 May 2010 23:01:59 -0000 1.5
@@ -1,45 +1,48 @@
Package: gnotepad+
Version: 1.3.3
-Revision: 4
+Revision: 5
Source: http://download.sourceforge.net/gnotepad/%n-%v.tar.gz
Source-MD5: 00f1de16e84cbbe65d85acc542b2791f
BuildDepends: <<
- atk1 (>= 1.24.0-1),
- cairo (>= 1.8-1),
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
fink (>= 0.24.12),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.18.0-1),
- gtk+2-dev (>= 2.14.0-1),
- libgettext3-dev,
- libpng3,
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ glib2-dev (>= 2.22.0-1),
+ glitz,
+ gtk+2-dev (>= 2.18.0-1),
+ libgettext8-dev,
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
x11-dev
<<
Depends: <<
- atk1-shlibs (>= 1.24.0-1),
- cairo-shlibs (>= 1.8-1),
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- glib2-shlibs (>= 2.18.0-1),
- gtk+2-shlibs (>= 2.14.0-1),
- libgettext3-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.22.0-4)
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libgettext8-shlibs,
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
PatchFile: %n.patch
-PatchFile-MD5: 71026f706202ea661bbed3ee30835288
+PatchFile-MD5: 55569e2e012db84c2e4131a40bb1ce37
ConfigureParams: --mandir=%p/share/man --disable-gnome --disable-gtkhtml
--disable-gtk-xmhtml
-SetCPPFLAGS: -DGTK_HAVE_FEATURES_1_1_0 -DGTK_ENABLE_BROKEN
+SetCPPFLAGS: -DGTK_HAVE_FEATURES_1_1_0 -DGTK_ENABLE_BROKEN -MD
CompileScript: <<
#!/bin/sh -ev
- export
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
export GTK_CONFIG="%p/bin/pkg-config gtk+-2.0"
export GNOME_CONFIG="/usr/bin/true"
- %{default_script}
+ ./configure %c
+ make INTLLIBS=-lintl
+ fink-package-precedence --depfile-ext='\.d' .
<<
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README TODO
@@ -60,4 +63,7 @@
(use some gnome1 functions or internal data elements that
don't have obvious direct gnome2 counterparts).
<<
+DescPort: <<
+ Recent glib doesn't publish -lintl, so pass it directly.
+<<
Homepage: http://gnotepad.sourceforge.net
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
