Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28428
Modified Files:
libzebrabar-py.info libzebrabar0-gtk.info libzebrabar0-qt.info
zebrabar.info
Added Files:
libzebrabar-py25.info libzebrabar-py25.patch
Log Message:
GNOME2.26 upgrades
--- NEW FILE: libzebrabar-py25.info ---
Info2: <<
Package: libzebrabar-py%type_pkg[python]
Version: 0.5
Revision: 1
Source: mirror:sourceforge:zebra/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
Type: python 2.5
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.6.4-2),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
glib2-dev (>= 2.14.0-1),
glitz,
libzebrabar3 (>= 0.5-4),
libzebrabar0-gtk (>= 0.5-1),
libgettext3-dev,
libiconv-dev,
libpng3,
pango1-xft2-ft219-dev (>= 1.20.5-1),
pixman (>= 0.10.0-1),
pkgconfig,
python%type_pkg[python],
pygtk2-gtk-py%type_pkg[python]-dev (>= 2.12.1-1),
pygobject2-py%type_pkg[python]-dev (>= 2.14.2-1),
x11-dev,
xft2-dev,
xmlto
<<
Depends: <<
atk1-shlibs (>= 1.20.0-1),
cairo-shlibs (>= 1.6.4-2),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.5-1),
glib2-shlibs (>= 2.14.0-1),
glitz-shlibs,
libzebrabar3-shlibs (>= 0.5-4),
libzebrabar0-gtk-shlibs (>= 0.5-1),
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.5-1),
pixman-shlibs (>= 0.10.0-1),
python%type_pkg[python],
pygtk2-gtk-py%type_pkg[python] (>= 2.12.1-1),
pygobject2-py%type_pkg[python] (>= 2.14.2-1),
x11-shlibs
<<
PatchFile: %n.patch
PatchFile-MD5: 426b5f36e77f320e1831800dad7bb278
PatchScript: <<
%{default_script}
mkdir -p _include/zebra
ln -s ../include/config.h _include
perl -pi -e 's,zebra/libzebra.la,,g' Makefile.in
perl -pi -e 's,zebra.pc,,g' Makefile.in
perl -pi -e 's,gtk/libzebragtk.la,,g' Makefile.in
perl -pi -e 's,zebra-gtk.pc,,g' Makefile.in
<<
ConfigureParams: --disable-dependency-tracking --disable-video
--without-imagemagick --without-npapi --with-gtk --with-python --without-qt
CompileScript: <<
#!/bin/sh -ex
# special stuff for gtk
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
# gather flags for installed zebra & zebra-gtk
ZEBRA_CFLAGS=`%p/bin/pkg-config --cflags zebra-gtk`
ZEBRA_LIBS=`%p/bin/pkg-config --libs zebra-gtk`
CPPFLAGS="$CPPFLAGS $ZEBRA_CFLAGS"
LDFLAGS="$LDFLAGS $ZEBRA_LIBS"
# special stuff for python
export PYTHON=%p/bin/python%type_raw[python]
export PYTHON_CONFIG=%p/bin/python%type_raw[python]-config
./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d include_HEADERS= zinclude_HEADERS=
rm -rf %i/share/doc/zebra
rmdir %i/bin
rm -rf %i/share/man
<<
DocFiles: COPYING.LIB ChangeLog HACKING NEWS README TODO
DescPackaging: <<
Hack makefiles and autoconf config.h locations to use
installed zebra instead of building locally.
Need to enable gtk in order to enable pygtk, but then hack to
use installed zebra-gtk instead of building locally.
Redo doc files manually so they go where we want and include
the files oriented towards users not installers.
This is just the python module; removing the should-be-empty bin
dir without -f makes sure we didn't accidentally build any
front-end programs. Only install gtk headers
Claims to allow pthon>=2.3.5, but uses pythonX.X-config, which
is only available for python>=2.5. See:
http://sourceforge.net/tracker/index.php?func=detail&aid=2052663&group_id=189236&atid=928515
<<
DescPort: <<
zebrapygtkmodule and zebrapygtk can't both define
__PyGObject_API. See:
http://sourceforge.net/tracker/index.php?func=detail&aid=2052681&group_id=189236&atid=928515
<<
Description: Python-gtk bindings for zebra barcode library
Homepage: http://zebra.sourceforge.net/
License: LGPL
Maintainer: Daniel Macks <dma...@netspace.org>
<<
Index: zebrabar.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/zebrabar.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zebrabar.info 15 Aug 2008 16:54:20 -0000 1.1
+++ zebrabar.info 13 Dec 2009 11:37:55 -0000 1.2
@@ -1,6 +1,6 @@
Package: zebrabar
Version: 0.5
-Revision: 1
+Revision: 2
Source: mirror:sourceforge:zebra/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
@@ -9,8 +9,8 @@
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- imagemagick1-dev,
+ freetype219 (>= 2.3.8-2),
+ imagemagick2-dev,
lcms,
libjpeg,
libtiff,
@@ -24,8 +24,8 @@
bzip2-shlibs,
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.5-1),
- imagemagick1-shlibs,
+ freetype219-shlibs (>= 2.3.8-2),
+ imagemagick2-shlibs,
lcms-shlibs,
libjpeg-shlibs,
libtiff-shlibs,
Index: libzebrabar0-qt.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/libzebrabar0-qt.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libzebrabar0-qt.info 14 Aug 2008 21:20:00 -0000 1.2
+++ libzebrabar0-qt.info 13 Dec 2009 11:37:55 -0000 1.3
@@ -1,6 +1,6 @@
Package: libzebrabar0-qt
Version: 0.5
-Revision: 2
+Revision: 3
Source: mirror:sourceforge:zebra/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
@@ -8,8 +8,8 @@
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- glib2-dev (>= 2.14.0-1),
+ freetype219 (>= 2.3.8-2),
+ glib2-dev (>= 2.20.0-1),
libzebrabar3 (>= 0.5-3),
libgettext3-dev,
libiconv-dev,
@@ -47,7 +47,7 @@
# special stuff for qt4
export PKG_CONFIG_PATH=%p/lib/qt4-x11/lib/pkgconfig:$PKG_CONFIG_PATH
- LDFLAGS="-L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib $LDFLAGS"
+ LDFLAGS="-L%p/lib/fontconfig2/lib $LDFLAGS"
./configure %c
make
@@ -66,8 +66,8 @@
Depends: <<
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.5-1),
- glib2-shlibs (>= 2.14.0-1),
+ freetype219-shlibs (>= 2.3.8-2),
+ glib2-shlibs (>= 2.20.0-1),
libzebrabar3-shlibs (>= 0.5-3),
libgettext3-shlibs,
libiconv,
Index: libzebrabar-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/libzebrabar-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libzebrabar-py.info 15 Aug 2008 06:16:24 -0000 1.1
+++ libzebrabar-py.info 13 Dec 2009 11:37:54 -0000 1.2
@@ -4,38 +4,38 @@
Revision: 1
Source: mirror:sourceforge:zebra/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
-Type: python (2.5)
+Type: python (2.6)
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- cairo (>= 1.6.4-2),
+ atk1 (>= 1.24.0-1),
+ cairo (>= 1.8-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- glib2-dev (>= 2.14.0-1),
+ freetype219 (>= 2.3.8-2),
+ glib2-dev (>= 2.20.0-1),
glitz,
libzebrabar3 (>= 0.5-4),
libzebrabar0-gtk (>= 0.5-1),
libgettext3-dev,
libiconv-dev,
libpng3,
- pango1-xft2-ft219-dev (>= 1.20.5-1),
- pixman (>= 0.10.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.0-1),
+ pixman (>= 0.16.0-1),
pkgconfig,
python%type_pkg[python],
- pygtk2-gtk-py%type_pkg[python]-dev (>= 2.12.1-1),
- pygobject2-py%type_pkg[python]-dev (>= 2.14.2-1),
+ pygtk2-gtk-py%type_pkg[python]-dev (>= 2.15.2-1),
+ pygobject2-py%type_pkg[python]-dev (>= 2.18.0-1),
x11-dev,
xft2-dev,
xmlto
<<
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- cairo-shlibs (>= 1.6.4-2),
+ atk1-shlibs (>= 1.24.0-1),
+ cairo-shlibs (>= 1.8-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.5-1),
+ freetype219-shlibs (>= 2.3.8-2),
glib2-shlibs (>= 2.14.0-1),
glitz-shlibs,
libzebrabar3-shlibs (>= 0.5-4),
@@ -43,11 +43,11 @@
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.20.5-1),
- pixman-shlibs (>= 0.10.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.0-1),
+ pixman-shlibs (>= 0.16.0-1),
python%type_pkg[python],
- pygtk2-gtk-py%type_pkg[python] (>= 2.12.1-1),
- pygobject2-py%type_pkg[python] (>= 2.14.2-1),
+ pygtk2-gtk-py%type_pkg[python] (>= 2.15.2-1),
+ pygobject2-py%type_pkg[python] (>= 2.18.0-1),
x11-shlibs
<<
@@ -68,7 +68,7 @@
CompileScript: <<
#!/bin/sh -ex
# special stuff for gtk
- export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
# gather flags for installed zebra & zebra-gtk
ZEBRA_CFLAGS=`%p/bin/pkg-config --cflags zebra-gtk`
@@ -86,7 +86,7 @@
InstallScript: <<
make install DESTDIR=%d include_HEADERS= zinclude_HEADERS=
rm -rf %i/share/doc/zebra
- rmdir %i/bin
+ rmdir %i/bin %i/include/zebra %i/include %i/lib/pkgconfig
rm -rf %i/share/man
<<
DocFiles: COPYING.LIB ChangeLog HACKING NEWS README TODO
@@ -101,9 +101,9 @@
Redo doc files manually so they go where we want and include
the files oriented towards users not installers.
- This is just the python module; removing the should-be-empty bin
- dir without -f makes sure we didn't accidentally build any
- front-end programs. Only install gtk headers
+ This is just the python module; removing the should-be-empty
+ without -f makes sure we didn't accidentally build any
+ front-end programs or install any extraneous headers.
Claims to allow pthon>=2.3.5, but uses pythonX.X-config, which
is only available for python>=2.5. See:
Index: libzebrabar0-gtk.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/libzebrabar0-gtk.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libzebrabar0-gtk.info 14 Aug 2008 22:05:45 -0000 1.1
+++ libzebrabar0-gtk.info 13 Dec 2009 11:37:55 -0000 1.2
@@ -1,24 +1,24 @@
Package: libzebrabar0-gtk
Version: 0.5
-Revision: 1
+Revision: 2
Source: mirror:sourceforge:zebra/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- cairo (>= 1.6.4-2),
+ atk1 (>= 1.24.0-1),
+ cairo (>= 1.8-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- glib2-dev (>= 2.14.0-1),
+ freetype219 (>= 2.3.8-2),
+ glib2-dev (>= 2.20.0-1),
glitz,
libzebrabar3 (>= 0.5-3),
libgettext3-dev,
libiconv-dev,
libpng3,
- pango1-xft2-ft219-dev (>= 1.20.5-1),
- pixman (>= 0.10.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.0-1),
+ pixman (>= 0.16.0-1),
pkgconfig,
x11-dev,
xft2-dev,
@@ -50,7 +50,7 @@
LDFLAGS="$LDFLAGS $ZEBRA_LIBS"
# special stuff for gtk
- export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
./configure %c
make
@@ -67,19 +67,19 @@
Package: %N-shlibs
Files: lib/libzebragtk.0.*
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- cairo-shlibs (>= 1.6.4-2),
+ atk1-shlibs (>= 1.24.0-1),
+ cairo-shlibs (>= 1.8-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.5-1),
- glib2-shlibs (>= 2.14.0-1),
+ freetype219-shlibs (>= 2.3.8-2),
+ glib2-shlibs (>= 2.20.0-1),
glitz-shlibs,
libzebrabar3-shlibs (>= 0.5-3),
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.20.5-1),
- pixman-shlibs (>= 0.10.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.0-1),
+ pixman-shlibs (>= 0.16-1),
x11-shlibs
<<
Shlibs: %p/lib/libzebragtk.0.dylib 1.0.0 %n (>= 0.5-1)
--- NEW FILE: libzebrabar-py25.patch ---
diff -Nurd -x'*~' zebra-0.5.orig/Makefile.in zebra-0.5/Makefile.in
--- zebra-0.5.orig/Makefile.in 2008-07-24 20:11:36.000000000 -0400
+++ zebra-0.5/Makefile.in 2008-08-13 23:41:58.000000000 -0400
@@ -274,7 +274,7 @@
zebraimg_zebraimg_OBJECTS = $(am_zebraimg_zebraimg_OBJECTS)
@have_magick_t...@zebraimg_zebraimg_dependencies = \
@HAVE_MAGICK_TRUE@ $(am__DEPENDENCIES_1) zebra/libzebra.la
-DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir)/include
+DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir)/_include
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -492,7 +492,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(srcdir)/include
+AM_CPPFLAGS =
AM_CFLAGS = -Wall
AM_CXXFLAGS = $(AM_CFLAGS)
ACLOCAL_AMFLAGS = -I config
diff -Nurd -x'*~' zebra-0.5.orig/configure zebra-0.5/configure
--- zebra-0.5.orig/configure 2008-07-24 20:11:34.000000000 -0400
+++ zebra-0.5/configure 2008-08-15 01:52:42.000000000 -0400
@@ -19093,7 +19093,7 @@
fi
if test "x$PYTHON_LIBS" = "x"; then
- PYTHON_LIBS=`$PYTHON_CONFIG --libs`
+ PYTHON_LIBS=`$PYTHON_CONFIG --ldflags`
fi
diff -Nurd -x'*~' zebra-0.5.orig/pygtk/zebrapygtkmodule.c
zebra-0.5/pygtk/zebrapygtkmodule.c
--- zebra-0.5.orig/pygtk/zebrapygtkmodule.c 2008-07-24 20:10:12.000000000
-0400
+++ zebra-0.5/pygtk/zebrapygtkmodule.c 2008-08-15 02:01:12.000000000 -0400
@@ -21,6 +21,7 @@
* http://sourceforge.net/projects/zebra
*------------------------------------------------------------------------*/
+#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
void zebrapygtk_register_classes(PyObject*);
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
