From 52563c4b4a59688c3b9577cacb965f725c52cb7e Mon Sep 17 00:00:00 2001 From: marcm Date: Sat, 3 Jan 2004 05:53:38 +0000 Subject: [PATCH] Despite the 2.5.0 version number, this is a bugfix update for 2.4 series. --- x11/gnome/librsvg/Makefile | 13 +-- x11/gnome/librsvg/distinfo | 6 +- x11/gnome/librsvg/patches/patch-configure | 105 +++++----------------- x11/gnome/librsvg/patches/patch-ltmain_sh | 53 ++++++----- x11/gnome/librsvg/patches/patch-rsvg_h | 14 --- x11/gnome/librsvg/pkg/PFRAG.shared | 4 +- x11/gnome/librsvg/pkg/PLIST | 12 +-- 7 files changed, 65 insertions(+), 142 deletions(-) delete mode 100644 x11/gnome/librsvg/patches/patch-rsvg_h diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile index a2dbe9124ff..b1324b77387 100644 --- a/x11/gnome/librsvg/Makefile +++ b/x11/gnome/librsvg/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.6 2003/10/07 17:12:23 marcm Exp $ +# $OpenBSD: Makefile,v 1.7 2004/01/03 05:53:38 marcm Exp $ COMMENT= "SAX-based render library for SVG files" -DISTNAME= librsvg-2.4.0 +DISTNAME= librsvg-2.5.0 CATEGORIES= devel x11/gnome HOMEPAGE= http://www.gnome.org MAINTAINER= Marc Matteo -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.4/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.5/} EXTRACT_SUFX= .tar.bz2 # LGPL @@ -17,26 +17,21 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gettext - BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= art_lgpl_2.5::graphics/libart \ bz2::archivers/bzip2 \ gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \ gsf-1::devel/libgsf \ pangoft2-1.0.0.0::devel/pango \ - popt::devel/popt \ + popt.0.3::devel/popt \ xml2.6::textproc/libxml -SEPARATE_BUILD= concurrent USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-svgz CONFIGURE_ARGS+= --without-croco -CONFIGURE_ARGS+= --without-gimp CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome/librsvg/distinfo b/x11/gnome/librsvg/distinfo index bd0d9865c48..6a928c0a074 100644 --- a/x11/gnome/librsvg/distinfo +++ b/x11/gnome/librsvg/distinfo @@ -1,3 +1,3 @@ -MD5 (librsvg-2.4.0.tar.bz2) = 1a073864e5f6e9793cf23e38dc723803 -RMD160 (librsvg-2.4.0.tar.bz2) = 839e30301ece3b97a55f8d198a427396b2683129 -SHA1 (librsvg-2.4.0.tar.bz2) = 37ff07c7cdbd6c5ace1a66034c2793a3d4860f7e +MD5 (librsvg-2.5.0.tar.bz2) = f3e7033a730c9fc0cf7f1430e7ca9fc3 +RMD160 (librsvg-2.5.0.tar.bz2) = 4a74978e1e03a64267781a8002437718048c64cc +SHA1 (librsvg-2.5.0.tar.bz2) = d52e55c872e046c3d0c85f7b8098df6b5c7d4ee5 diff --git a/x11/gnome/librsvg/patches/patch-configure b/x11/gnome/librsvg/patches/patch-configure index 8c00d7401b8..bf023a94d0f 100644 --- a/x11/gnome/librsvg/patches/patch-configure +++ b/x11/gnome/librsvg/patches/patch-configure @@ -1,84 +1,21 @@ -$OpenBSD: patch-configure,v 1.4 2003/10/07 05:48:55 marcm Exp $ ---- configure.orig 2003-09-08 05:35:23.000000000 -0700 -+++ configure 2003-09-10 08:27:54.000000000 -0700 -@@ -8793,21 +8793,21 @@ fi - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED" >&5 -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED" >&5 - echo $ECHO_N "checking for \ - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED... $ECHO_C" >&6 -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "\ - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED" ; then -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - succeeded=yes -@@ -8815,10 +8815,10 @@ echo "${ECHO_T}yes" >&6 - echo "$as_me:$LINENO: checking LIBRSVG_CFLAGS" >&5 - echo $ECHO_N "checking LIBRSVG_CFLAGS... $ECHO_C" >&6 - LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "\ -+ libxml-2.0 >= $LIBXML_REQUIRED \ - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ - pangoft2 >= $PANGOFT2_REQUIRED"` - echo "$as_me:$LINENO: result: $LIBRSVG_CFLAGS" >&5 - echo "${ECHO_T}$LIBRSVG_CFLAGS" >&6 -@@ -8829,8 +8829,8 @@ echo $ECHO_N "checking LIBRSVG_LIBS... $ - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED"` -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED"` - echo "$as_me:$LINENO: result: $LIBRSVG_LIBS" >&5 - echo "${ECHO_T}$LIBRSVG_LIBS" >&6 - else -@@ -8842,8 +8842,8 @@ echo "${ECHO_T}$LIBRSVG_LIBS" >&6 - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED"` -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED"` - echo $LIBRSVG_PKG_ERRORS - fi - -@@ -8862,14 +8862,14 @@ echo "${ECHO_T}$LIBRSVG_LIBS" >&6 - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 - echo "$as_me: error: Library requirements (\ - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ - glib-2.0 >= $GLIB_REQUIRED \ - libart-2.0 >= $LIBART_REQUIRED \ -- libxml-2.0 >= $LIBXML_REQUIRED \ -- pangoft2 >= $PANGOFT2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} -+ pangoft2 >= $PANGOFT2_REQUIRED \ -+ libxml-2.0 >= $LIBXML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} - { (exit 1); exit 1; }; } - fi - +$OpenBSD: patch-configure,v 1.5 2004/01/03 05:53:38 marcm Exp $ +--- configure.orig 2003-12-08 21:44:03.000000000 -0800 ++++ configure 2003-12-08 21:44:34.000000000 -0800 +@@ -5857,7 +5857,7 @@ else + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else +@@ -5867,7 +5867,7 @@ else + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac diff --git a/x11/gnome/librsvg/patches/patch-ltmain_sh b/x11/gnome/librsvg/patches/patch-ltmain_sh index 7751fd873d7..ba531b5f956 100644 --- a/x11/gnome/librsvg/patches/patch-ltmain_sh +++ b/x11/gnome/librsvg/patches/patch-ltmain_sh @@ -1,35 +1,45 @@ -$OpenBSD: patch-ltmain_sh,v 1.4 2003/10/07 05:48:55 marcm Exp $ ---- ltmain.sh.orig 2003-02-08 06:47:44.000000000 -0800 -+++ ltmain.sh 2003-09-10 08:27:55.000000000 -0700 -@@ -1085,6 +1085,17 @@ compiler." +$OpenBSD: patch-ltmain_sh,v 1.5 2004/01/03 05:53:38 marcm Exp $ +--- ltmain.sh.orig 2003-12-07 11:35:20.000000000 -0800 ++++ ltmain.sh 2003-12-08 21:46:16.000000000 -0800 +@@ -1073,6 +1073,17 @@ compiler." continue ;; + -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; ++ case $host in ++ *-*-openbsd*) ++ deplibs="$deplibs $arg" ++ ;; ++ *) ++ continue ++ ;; ++ esac ++ ;; + -module) module=yes continue -@@ -1525,6 +1536,9 @@ compiler." +@@ -1530,6 +1541,19 @@ compiler." fi continue ;; -+ -pthread) -+ continue -+ ;; ++ -pthread) ++ case $linkmode in ++ lib) ++ deplibs="$deplib $deplibs" ++ newdependency_libs="$deplib $newdependency_libs" ++ ;; ++ prog) ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ ;; ++ esac ++ continue ++ ;; %DEPLIBS%) alldeplibs=yes continue -@@ -1770,11 +1784,6 @@ compiler." +@@ -1775,10 +1799,6 @@ compiler." continue fi @@ -37,13 +47,12 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2003/10/07 05:48:55 marcm Exp $ - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi -- + if test -n "$old_archive_from_expsyms_cmds"; then # figure out the soname - set dummy $library_names -@@ -4580,40 +4589,6 @@ relink_command=\"$relink_command\"" +@@ -4526,40 +4546,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 + test "$show" = : && exit 0 - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" diff --git a/x11/gnome/librsvg/patches/patch-rsvg_h b/x11/gnome/librsvg/patches/patch-rsvg_h deleted file mode 100644 index a9494d54f9e..00000000000 --- a/x11/gnome/librsvg/patches/patch-rsvg_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-rsvg_h,v 1.1 2003/06/12 20:01:29 marcm Exp $ ---- rsvg.h.orig Mon May 12 13:05:39 2003 -+++ rsvg.h Mon May 12 13:06:44 2003 -@@ -27,6 +27,10 @@ - - #include - -+#ifndef POPT_TABLEEND -+#define POPT_TABLEEND {NULL, '\0', 0, 0, 0, NULL, NULL } -+#endif -+ - G_BEGIN_DECLS - - typedef enum { diff --git a/x11/gnome/librsvg/pkg/PFRAG.shared b/x11/gnome/librsvg/pkg/PFRAG.shared index 34606ecfcbe..9bec0bd8b07 100644 --- a/x11/gnome/librsvg/pkg/PFRAG.shared +++ b/x11/gnome/librsvg/pkg/PFRAG.shared @@ -1,5 +1,5 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2003/10/07 05:48:55 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2004/01/03 05:53:38 marcm Exp $ lib/gtk-2.0/2.2.0/engines/libsvg.so lib/gtk-2.0/2.2.0/loaders/svg_loader.so -lib/librsvg-2.so.6.0 +lib/librsvg-2.so.7.0 DYNLIBDIR(%D/lib) diff --git a/x11/gnome/librsvg/pkg/PLIST b/x11/gnome/librsvg/pkg/PLIST index 7ab1349711d..5da0cacd244 100644 --- a/x11/gnome/librsvg/pkg/PLIST +++ b/x11/gnome/librsvg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2003/12/08 06:10:23 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.7 2004/01/03 05:53:38 marcm Exp $ bin/rsvg include/librsvg-2/librsvg/librsvg-features.h include/librsvg-2/librsvg/rsvg-gz.h @@ -12,13 +12,13 @@ lib/librsvg-2.la lib/pkgconfig/librsvg-2.0.pc man/man1/rsvg.1 share/doc/librsvg/html/home.png -share/doc/librsvg/html/i1013.html +share/doc/librsvg/html/i967.html share/doc/librsvg/html/index.html share/doc/librsvg/html/index.sgml share/doc/librsvg/html/left.png share/doc/librsvg/html/r22.html -share/doc/librsvg/html/r376.html -share/doc/librsvg/html/r413.html +share/doc/librsvg/html/r373.html +share/doc/librsvg/html/r407.html share/doc/librsvg/html/right.png share/doc/librsvg/html/rsvg-convenience-functions.html share/doc/librsvg/html/rsvg-core-api.html @@ -28,10 +28,6 @@ share/doc/librsvg/html/up.png %%SHARED%% @dirrm share/doc/librsvg/html @dirrm share/doc/librsvg -@comment @exec mkdir -p %D/lib/gimp/1.3/plug-ins -@comment @dirrm lib/gimp/1.3/plug-ins -@comment @dirrm lib/gimp/1.3 -@comment @dirrm lib/gimp @dirrm include/librsvg-2/librsvg @dirrm include/librsvg-2 @exec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders