Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22429
Modified Files:
gedit-plugins.info gedit.info gedit.patch
Log Message:
new versions
Index: gedit.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gedit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gedit.patch 15 Jul 2008 01:40:55 -0000 1.3
+++ gedit.patch 21 Nov 2008 04:38:10 -0000 1.4
@@ -1,20 +1,31 @@
-diff -uNr gedit-2.20.0/gedit/gedit-python-module.c
gedit-2.20.0-new/gedit/gedit-python-module.c
---- gedit-2.20.0/gedit/gedit-python-module.c 2007-07-21 06:31:18.000000000
-0400
-+++ gedit-2.20.0-new/gedit/gedit-python-module.c 2007-09-26
10:55:41.000000000 -0400
-@@ -24,6 +24,9 @@
- #include <config.h>
+diff -Nurd -x'*~' gedit-2.24.1.orig/configure gedit-2.24.1/configure
+--- gedit-2.24.1.orig/configure 2008-11-02 18:18:39.000000000 -0500
++++ gedit-2.24.1/configure 2008-11-20 17:35:40.000000000 -0500
+@@ -23903,7 +23903,7 @@
+ echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+-GEDIT_LIBS="${GEDIT_LIBS}"
++GEDIT_LIBS="${GEDIT_LIBS} -lSM"
+
+
+
+diff -Nurd -x'*~' gedit-2.24.1.orig/gedit/gedit-python-module.c
gedit-2.24.1/gedit/gedit-python-module.c
+--- gedit-2.24.1.orig/gedit/gedit-python-module.c 2008-09-07
12:13:19.000000000 -0400
++++ gedit-2.24.1/gedit/gedit-python-module.c 2008-11-20 18:06:56.000000000
-0500
+@@ -25,6 +25,8 @@
#endif
+ #include <Python.h>
+#undef NO_IMPORT_PYGOBJECT
+#undef NO_IMPORT_PYGTK
-+
#include <pygobject.h>
#include <pygtk/pygtk.h>
-diff -uNr gedit-2.20.0/plugins/externaltools/data/Makefile.in
gedit-2.20.0-new/plugins/externaltools/data/Makefile.in
---- gedit-2.20.0/plugins/externaltools/data/Makefile.in 2007-09-17
06:51:11.000000000 -0400
-+++ gedit-2.20.0-new/plugins/externaltools/data/Makefile.in 2007-09-26
10:56:03.000000000 -0400
-@@ -465,7 +465,7 @@
+diff -Nurd -x'*~' gedit-2.24.1.orig/plugins/externaltools/data/Makefile.in
gedit-2.24.1/plugins/externaltools/data/Makefile.in
+--- gedit-2.24.1.orig/plugins/externaltools/data/Makefile.in 2008-11-02
18:18:43.000000000 -0500
++++ gedit-2.24.1/plugins/externaltools/data/Makefile.in 2008-11-20
17:28:16.000000000 -0500
+@@ -471,7 +471,7 @@
# (.desktop), which happens to be translated using intltool.
$(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
Index: gedit-plugins.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gedit-plugins.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gedit-plugins.info 27 Sep 2008 20:48:32 -0000 1.3
+++ gedit-plugins.info 21 Nov 2008 04:38:10 -0000 1.4
@@ -1,109 +1,82 @@
Package: gedit-plugins
-Version: 2.20.0
-Revision: 2
+Version: 2.22.5
+Revision: 1
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- audiofile-shlibs (>= 0.2.5-1),
+ atk1-shlibs (>= 1.24.0-1),
desktop-file-utils,
- eel2.2-shlibs (>= 2.20.0-1),
- enchant,
- esound-shlibs (>= 0.2.38-1),
- gail18 (>= 1.20.0-1),
- gconf2 (>= 2.20.0-1),
- gedit (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- gnome-keyring-shlibs (>= 0.8.1-1),
- gnome-python2-desktop-py25 (>= 2.19.2-1),
- gnome-vfs2-unified (>= 1:2.20.0-1),
+ expat1-shlibs,
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.7-7),
+ gconf2 (>= 2.24.0-1),
+ gedit (>= 2.24.0-1),
+ glib2-shlibs (>= 2.18.0-1),
+ glitz-shlibs,
+ gnome-python2-desktop-py25 (>= 2.20.0-3),
+ gnome-vfs2-unified (>= 1:2.24.0-1),
gtk+2 (>= 2.12.0-1),
- gtksourceview2-shlibs,
- gucharmap (>= 1.10-1),
+ gtksourceview2-shlibs (>= 2.4.1-1),
+ gucharmap (>= 2.24-1),
+ gucharmap7-shlibs,
iso-codes,
- libart2-shlibs (>= 2.3.16-1),
- libbonobo2 (>= 2.20.0-1),
- libbonoboui2 (>= 2.20.0-1),
+ libavahi-client3-shlibs,
+ libavahi-common3-shlibs,
+ libavahi-glib1-shlibs,
libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.2-1),
- libgnome2 (>= 2.20.0-1),
- libgnomeui2 (>= 2.20.0-1),
- libgnomecanvas2 (>= 2.20.0-1),
- libgnomeprint2.2-shlibs (>= 2.18.2-1),
- libgnomeprintui2.2-shlibs (>= 2.18.1-1),
+ libglade2-shlibs (>= 2.6.3-1),
libiconv,
- libjpeg-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2 (>= 2.14.9-1),
- pango1-xft2-ft219 (>= 1.18.4-4),
- popt-shlibs (>= 1.5-1),
+ orbit2 (>= 2.14.16-1),
+ pango1-xft2-ft219 (>= 1.22.0-4),
rarian-compat,
x11-shlibs
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
+ atk1 (>= 1.24.0-1),
avahi-dev,
- audiofile,
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
- eel2.2-dev (>= 2.20.0-1),
- enchant1-dev,
- esound (>= 0.2.38-1),
+ cairo (>= 1.8-1),
+ dbus-dev (>= 1.2.1-1),
expat1,
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gail18-dev (>= 1.20.0-1),
- gconf2-dev (>= 2.20.0-1),
- gedit-dev (>= 2.20.0-1),
+ freetype219 (>= 2.3.7-7),
+ gconf2-dev (>= 2.24.0-1),
+ gedit-dev (>= 2.24.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.0-1),
glitz,
- gnome-doc-utils (>= 0.12.0-1),
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-python2-desktop-py25-dev (>= 2.19.2-1),
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk+2-dev (>= 2.12.0-1),
- gtksourceview2-dev,
- gucharmap6-dev,
- intltool (>= 0.36.0-1),
+ gnome-doc-utils (>= 0.14.0-1),
+ gnome-python2-desktop-py25-dev (>= 2.20.0-3),
+ gnome-vfs2-unified-dev (>= 1:2.24.0-1),
+ gtk+2-dev (>= 2.14.0-1),
+ gtksourceview2-dev (>= 2.4.1-1),
+ gucharmap7-dev,
+ intltool40,
iso-codes,
- libart2 (>= 2.3.16-1),
libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
libgettext3-dev,
- libglade2 (>= 2.6.2-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnome2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.20.0-1),
- libgnomeprint2.2-dev (>= 2.18.2-1),
- libgnomeprintui2.2-dev (>= 2.18.1-1),
+ libglade2 (>= 2.6.3-1),
libiconv-dev,
- libjpeg,
libpng3,
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
- popt (>= 1.5-1),
+ orbit2-dev (>= 2.14.16-1),
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.23),
python25,
- pycairo-py25-dev,
- pygobject2-py25-dev (>= 2.12.0-1),
- pygtk2-gtk-py25-dev (>= 2.10.0-1),
- pygtksourceview2-py25-dev (>= 2.0.0-1),
+ pycairo-py25-dev (>= 1.6.4-2),
+ pygobject2-py25-dev (>= 2.15.4-2),
+ pygtk2-gtk-py25-dev (>= 2.12.1-1),
+ pygtksourceview2-py25-dev (>= 2.4.0-1),
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
-Source-MD5: ec5be3d10ca4da4b33effad207ef35e9
-PatchScript: <<
- perl -pi -e 's,gedit-2.16,gedit-2.20,g;
s,gtksourceview-1.0,gtksourceview-2.0,g' configure
- perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.5|'
`find . -name \*.py -o -name \*.in`
-<<
-SetLIBS: -L%p/lib
-ConfigureParams: --with-plugins=all --disable-scrollkeeper
--disable-schemas-install --mandir=%p/share/man --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config PYTHON=%p/bin/python2.5
+Source: mirror:gnome:sources/%n/2.22/%n-%v.tar.bz2
+Source-MD5: c2104d56b7aa78e14395648f8e235306
+#PatchScript: <<
+#<<
+ConfigureParams: --with-plugins=all --disable-scrollkeeper
--disable-schemas-install --mandir=%p/share/man --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
PYTHON=%p/bin/python2.5
InstallScript: <<
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make -j1 install DESTDIR="%d"
+ make -j1 install DESTDIR="%d"
<<
PostInstScript: <<
if [ configure = "$1" ]; then
Index: gedit.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gedit.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gedit.info 25 Sep 2008 19:15:41 -0000 1.12
+++ gedit.info 21 Nov 2008 04:38:10 -0000 1.13
@@ -1,116 +1,84 @@
Package: gedit
-Version: 2.20.4
-Revision: 2
+Version: 2.24.1
+Revision: 1
Depends: <<
atk1-shlibs (>= 1.20.0-1),
- audiofile-shlibs (>= 0.2.5-1),
+ dbus-shlibs (>= 1.2.1-1),
desktop-file-utils,
- eel2.2-shlibs (>= 2.20.0-1),
- enchant,
- esound-shlibs (>= 0.2.38-1),
- gail18 (>= 1.20.0-1),
+ enchant (>= 1.4.2-1),
+ enchant1-shlibs (>= 1.4.2-1),
+ expat1-shlibs,
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.7-7),
gconf2 (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- gnome-keyring-shlibs (>= 0.8.1-1),
- gnome-vfs2-unified (>= 1:2.20.0-1),
- gtk+2 (>= 2.12.0-1),
- gtksourceview2-shlibs (>= 2.0.0-1),
+ glib2-shlibs (>= 2.18.0-1),
+ glitz-shlibs,
+ gtk+2 (>= 2.14.0-1),
+ gtksourceview2-shlibs (>= 2.4.1-1),
iso-codes,
- libart2-shlibs (>= 2.3.16-1),
- libbonobo2 (>= 2.20.0-1),
- libbonoboui2 (>= 2.20.0-1),
libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.2-1),
- libgnome2 (>= 2.20.0-1),
- libgnomeui2 (>= 2.20.0-1),
- libgnomecanvas2 (>= 2.20.0-1),
- libgnomeprint2.2-shlibs (>= 2.18.2-1),
- libgnomeprintui2.2-shlibs (>= 2.18.1-1),
libiconv,
- libjpeg-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2 (>= 2.14.9-1),
- pango1-xft2-ft219 (>= 1.18.4-4),
- popt-shlibs,
- pygtk2-gtk-py25 (>= 2.10.0-1),
- pygtksourceview2-py25 (>= 2.0.0-1),
+ orbit2 (>= 2.14.16-1),
+ pango1-xft2-ft219 (>= 1.22.0-4),
+ pixman-shlibs (>= 0.12.0-1),
+ pygtk2-gtk-py25 (>= 2.12.1-1),
+ pygtksourceview2-py25 (>= 2.4.0-1),
rarian-compat,
x11-shlibs
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- audiofile,
- avahi-dev,
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
- eel2.2-dev (>= 2.20.0-1),
- enchant1-dev,
- esound (>= 0.2.38-1),
+ atk1 (>= 1.24.0-1),
+ cairo (>= 1.8-1),
+ dbus-dev (>= 1.2.1-1),
+ enchant1-dev (>= 1.4.2-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gail18-dev (>= 1.20.0-1),
+ freetype219 (>= 2.3.7-7),
gconf2-dev (>= 2.20.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.0-1),
glitz,
- gnome-desktop4-dev,
- gnome-doc-utils (>= 0.12.0-1),
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-menus2-dev,
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk-doc,
- gtk+2-dev (>= 2.12.0-1),
- gtksourceview2-dev (>= 2.0.0-1),
- intltool (>= 0.36.0-1),
+ gnome-doc-utils (>= 0.14.0-1),
+ gtk-doc (>= 1.8-1),
+ gtk+2-dev (>= 2.14.0-1),
+ gtksourceview2-dev (>= 2.4.1-1),
+ intltool40,
iso-codes,
- libart2 (>= 2.3.16-1),
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
libgettext3-dev,
- libglade2 (>= 2.6.2-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnome2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.20.0-1),
- libgnomeprint2.2-dev (>= 2.18.2-1),
- libgnomeprintui2.2-dev (>= 2.18.1-1),
libiconv-dev,
- libjpeg,
libpng3,
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
- popt,
+ orbit2-dev (>= 2.14.16-1),
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.23),
python25,
- pycairo-py25-dev,
- pygobject2-py25-dev (>= 2.12.0-1),
- pygtk2-gtk-py25-dev (>= 2.10.0-1),
- pygtksourceview2-py25-dev (>= 2.0.0-1),
+ pycairo-py25-dev (>= 1.6.4-2),
+ pygobject2-py25-dev (>= 2.15.4-2),
+ pygtk2-gtk-py25-dev (>= 2.12.1-1),
+ pygtksourceview2-py25-dev (>= 2.4.0-1),
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
-Source-MD5: 6c7d74f9b4339c9ec9e81f6ea3eb19c9
+Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
+Source-MD5: 48b94379a81430adee427e2542cc93e9
PatchFile: %n.patch
-PatchFile-MD5: 6d6b7144aff6951a36b02ecec56b8a54
+PatchFile-MD5: 72186ad30b2522ac190711fc3cf8ecd1
PatchScript: <<
%{default_script}
perl -pi -e 's/(-scrollkeeper-update)/#\1/' help/*/Makefile.in
- perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.5|'
`find . -name \*.py -o -name \*.in`
+# perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.5|'
`find . -name \*.py -o -name \*.in`
+ perl -pi -e 's/sm >= 1.0.0//g' configure
<<
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -fno-common
-DNO_IMPORT_PYGOBJECT=1 -DNO_IMPORT_PYGTK=1
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+SetCPPFLAGS: -I%p/lib/fontconfig2/include -fno-common -DNO_IMPORT_PYGOBJECT=1
-DNO_IMPORT_PYGTK=1
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os -pipe
-ConfigureParams: --disable-static --disable-scrollkeeper
--disable-schemas-install --mandir=%p/share/man --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config PYTHON=%p/bin/python2.5
F77=no
+ConfigureParams: --disable-static --disable-scrollkeeper
--disable-schemas-install --mandir=%p/share/man --libexecdir=%p/lib
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
PYTHON=%p/bin/python2.5 F77=no
InstallScript: <<
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make -j1 install DESTDIR="%d"
+ make -j1 install DESTDIR="%d"
<<
SplitOff: <<
Package: %N-dev
@@ -119,6 +87,7 @@
BuildDependsOnly: true
Depends: %N (= %v-%r)
Replaces: %N (<< %v-%r)
+ DocFiles: AUTHORS BUGS COPYING ChangeLog NEWS README
<<
PostInstScript: <<
if [ configure = "$1" ]; then
@@ -154,4 +123,6 @@
Fix non-portable chmod syntax. See:
http://bugzilla.gnome.org/show_bug.cgi?id=510118
+
+ Don't have sm.pc on 10.4/apple-x11 so just pass -lSM
<<
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
