From 0f9f74c5712b5324175071223cfb75e8fef9b231 Mon Sep 17 00:00:00 2001 From: marcm Date: Thu, 24 Jun 2004 18:40:14 +0000 Subject: [PATCH] Update to 0.132 to sync up with Gnome 2.6. And printing works too :) --- textproc/gpdf/Makefile | 11 +- textproc/gpdf/distinfo | 6 +- textproc/gpdf/patches/patch-ltmain_sh | 72 --------- textproc/gpdf/patches/patch-shell_gpdf_c | 20 --- .../gpdf/patches/patch-xpdf_gpdf-control_cc | 14 ++ textproc/gpdf/pkg/PLIST | 153 ++++++------------ 6 files changed, 74 insertions(+), 202 deletions(-) delete mode 100644 textproc/gpdf/patches/patch-ltmain_sh delete mode 100644 textproc/gpdf/patches/patch-shell_gpdf_c create mode 100644 textproc/gpdf/patches/patch-xpdf_gpdf-control_cc diff --git a/textproc/gpdf/Makefile b/textproc/gpdf/Makefile index ecb2a6bbdca..b9674ec1f1d 100644 --- a/textproc/gpdf/Makefile +++ b/textproc/gpdf/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2004/04/08 06:22:34 marcm Exp $ +# $OpenBSD: Makefile,v 1.4 2004/06/24 18:40:14 marcm Exp $ COMMENT= "PDF viewer for GNOME" -DISTNAME= gpdf-0.112 +DISTNAME= gpdf-0.132 CATEGORIES= textproc x11/gnome HOMEPAGE= http://www.inf.tu-dresden.de/~mk793652/gpdf/ @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gpdf/0.112/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gpdf/0.132/} EXTRACT_SUFX= .tar.bz2 MODULES= gettext @@ -27,7 +27,12 @@ LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ USE_GMAKE= Yes CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= --disable-schemas-install +CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gpdf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +post-patch: + @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update + .include diff --git a/textproc/gpdf/distinfo b/textproc/gpdf/distinfo index f8cd5398809..3585c47d5d5 100644 --- a/textproc/gpdf/distinfo +++ b/textproc/gpdf/distinfo @@ -1,3 +1,3 @@ -MD5 (gpdf-0.112.tar.bz2) = 4df88fb2d9998807c05ce6cc395c022f -RMD160 (gpdf-0.112.tar.bz2) = 6067d277d45dd791c2bc1fa4731578fe00123f7f -SHA1 (gpdf-0.112.tar.bz2) = 0ef7d87f4154bdd9f9174c02f2e29a78a23a7007 +MD5 (gpdf-0.132.tar.bz2) = 1b8ba3384210b89a3628281e6aa5edaa +RMD160 (gpdf-0.132.tar.bz2) = 98d2d06064d80382eaaa9bfb8fdb346e5e862916 +SHA1 (gpdf-0.132.tar.bz2) = 6039f50b1fa5e0a0afb74928ed7827d3042c5ee4 diff --git a/textproc/gpdf/patches/patch-ltmain_sh b/textproc/gpdf/patches/patch-ltmain_sh deleted file mode 100644 index c914cc3f40f..00000000000 --- a/textproc/gpdf/patches/patch-ltmain_sh +++ /dev/null @@ -1,72 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/08 01:28:19 marcm Exp $ ---- ltmain.sh.orig 2003-08-01 18:57:12.000000000 -0700 -+++ ltmain.sh 2003-08-26 14:49:18.000000000 -0700 -@@ -1288,6 +1288,17 @@ EOF - continue - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1965,6 +1976,9 @@ EOF - fi - continue - ;; -+ -pthread) -+ continue -+ ;; - %DEPLIBS%) - alldeplibs=yes - continue -@@ -5728,40 +5742,6 @@ relink_command=\"$relink_command\"" - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- $echo "----------------------------------------------------------------------" -- $echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $echo " $libdir" -- done -- $echo -- $echo "If you ever happen to want to link against installed libraries" -- $echo "in a given directory, LIBDIR, you must either use libtool, and" -- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $echo " during execution" -- fi -- if test -n "$runpath_var"; then -- $echo " - add LIBDIR to the \`$runpath_var' environment variable" -- $echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- $echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- $echo -- $echo "See any operating system documentation about shared libraries for" -- $echo "more information, such as the ld(1) and ld.so(8) manual pages." -- $echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/textproc/gpdf/patches/patch-shell_gpdf_c b/textproc/gpdf/patches/patch-shell_gpdf_c deleted file mode 100644 index 4d7563bbc1b..00000000000 --- a/textproc/gpdf/patches/patch-shell_gpdf_c +++ /dev/null @@ -1,20 +0,0 @@ ---- shell/gpdf.c.orig Sun Apr 4 10:27:08 2004 -+++ shell/gpdf.c Sun Apr 4 10:33:25 2004 -@@ -121,16 +121,7 @@ - static void - set_window_icon_default (void) - { -- GdkPixbuf *pixbuf; -- -- pixbuf = gdk_pixbuf_new_from_file (GNOMEICONDIR "/gnome-pdf.png", NULL); -- -- if (pixbuf == NULL) -- return; -- -- gtk_window_set_default_icon (pixbuf); -- -- g_object_unref (pixbuf); -+ gtk_window_set_default_icon_from_file (GNOMEICONDIR "/gnome-pdf.png", NULL); - } - - int diff --git a/textproc/gpdf/patches/patch-xpdf_gpdf-control_cc b/textproc/gpdf/patches/patch-xpdf_gpdf-control_cc new file mode 100644 index 00000000000..4dd4f844a1c --- /dev/null +++ b/textproc/gpdf/patches/patch-xpdf_gpdf-control_cc @@ -0,0 +1,14 @@ +$OpenBSD: patch-xpdf_gpdf-control_cc,v 1.1 2004/06/24 18:40:14 marcm Exp $ +--- xpdf/gpdf-control.cc.orig Mon Jun 7 11:04:42 2004 ++++ xpdf/gpdf-control.cc Thu Jun 24 12:02:02 2004 +@@ -62,6 +62,10 @@ BEGIN_EXTERN_C + #define GPDF_GNOME_HELP_DOC_ID "gpdf" + #define GPDF_GNOME_HELP_FILENAME "gpdf.xml" + ++#ifndef GNOME_PRINT_KEY_DUPLEX ++#define GNOME_PRINT_KEY_DUPLEX "Settings.Output.Job.Duplex" ++#endif ++ + struct _GPdfControlPrivate { + GPdfPersistStream *persist_stream; + GPdfPersistFile *persist_file; diff --git a/textproc/gpdf/pkg/PLIST b/textproc/gpdf/pkg/PLIST index c18b2003805..89f8517bb62 100644 --- a/textproc/gpdf/pkg/PLIST +++ b/textproc/gpdf/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2003/12/15 19:29:55 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.3 2004/06/24 18:40:14 marcm Exp $ bin/gpdf lib/bonobo/servers/GNOME_PDF.server libexec/gnome-pdf-viewer @@ -6,25 +6,46 @@ share/application-registry/gpdf.applications share/applications/gpdf.desktop share/gnome-2.0/ui/gpdf-control-ui.xml share/gnome-2.0/ui/gpdf-window-ui.xml +share/gnome/help/gpdf/C/figures/gpdf_start_window.png +share/gnome/help/gpdf/C/figures/gpdf_window.png +share/gnome/help/gpdf/C/gpdf.xml +share/gnome/help/gpdf/C/legal.xml +share/gnome/help/gpdf/de/figures/gpdf_window.png +share/gnome/help/gpdf/de/gpdf.xml +share/gnome/help/gpdf/de/legal.xml +share/gnome/help/gpdf/es/figures/gpdf_start_window.png +share/gnome/help/gpdf/es/gpdf.xml +share/gnome/help/gpdf/es/legal.xml +share/gpdf/glade/gpdf-print-progress-dialog.glade share/gpdf/glade/gpdf-properties-dialog.glade +share/locale/af/LC_MESSAGES/gpdf.mo share/locale/am/LC_MESSAGES/gpdf.mo +share/locale/ar/LC_MESSAGES/gpdf.mo share/locale/az/LC_MESSAGES/gpdf.mo share/locale/be/LC_MESSAGES/gpdf.mo +share/locale/bn/LC_MESSAGES/gpdf.mo share/locale/ca/LC_MESSAGES/gpdf.mo share/locale/cs/LC_MESSAGES/gpdf.mo share/locale/cy/LC_MESSAGES/gpdf.mo share/locale/da/LC_MESSAGES/gpdf.mo share/locale/de/LC_MESSAGES/gpdf.mo share/locale/el/LC_MESSAGES/gpdf.mo +share/locale/en_CA/LC_MESSAGES/gpdf.mo +share/locale/en_GB/LC_MESSAGES/gpdf.mo share/locale/eo/LC_MESSAGES/gpdf.mo share/locale/es/LC_MESSAGES/gpdf.mo +share/locale/eu/LC_MESSAGES/gpdf.mo +share/locale/fa/LC_MESSAGES/gpdf.mo share/locale/fi/LC_MESSAGES/gpdf.mo share/locale/fr/LC_MESSAGES/gpdf.mo share/locale/ga/LC_MESSAGES/gpdf.mo share/locale/gl/LC_MESSAGES/gpdf.mo +share/locale/gu/LC_MESSAGES/gpdf.mo share/locale/he/LC_MESSAGES/gpdf.mo share/locale/hi/LC_MESSAGES/gpdf.mo +share/locale/hr/LC_MESSAGES/gpdf.mo share/locale/hu/LC_MESSAGES/gpdf.mo +share/locale/id/LC_MESSAGES/gpdf.mo share/locale/is/LC_MESSAGES/gpdf.mo share/locale/it/LC_MESSAGES/gpdf.mo share/locale/ja/LC_MESSAGES/gpdf.mo @@ -34,16 +55,19 @@ share/locale/lt/LC_MESSAGES/gpdf.mo share/locale/lv/LC_MESSAGES/gpdf.mo share/locale/mk/LC_MESSAGES/gpdf.mo share/locale/ml/LC_MESSAGES/gpdf.mo +share/locale/mn/LC_MESSAGES/gpdf.mo share/locale/ms/LC_MESSAGES/gpdf.mo share/locale/nl/LC_MESSAGES/gpdf.mo share/locale/nn/LC_MESSAGES/gpdf.mo share/locale/no/LC_MESSAGES/gpdf.mo +share/locale/pa/LC_MESSAGES/gpdf.mo share/locale/pl/LC_MESSAGES/gpdf.mo share/locale/pt/LC_MESSAGES/gpdf.mo share/locale/pt_BR/LC_MESSAGES/gpdf.mo share/locale/ro/LC_MESSAGES/gpdf.mo share/locale/ru/LC_MESSAGES/gpdf.mo share/locale/sk/LC_MESSAGES/gpdf.mo +share/locale/sl/LC_MESSAGES/gpdf.mo share/locale/sq/LC_MESSAGES/gpdf.mo share/locale/sr/LC_MESSAGES/gpdf.mo share/locale/sr@Latn/LC_MESSAGES/gpdf.mo @@ -57,112 +81,33 @@ share/locale/wa/LC_MESSAGES/gpdf.mo share/locale/zh_CN/LC_MESSAGES/gpdf.mo share/locale/zh_TW/LC_MESSAGES/gpdf.mo share/mime-info/gpdf.keys +share/omf/gpdf/gpdf-C.omf +share/omf/gpdf/gpdf-de.omf +share/omf/gpdf/gpdf-es.omf share/pixmaps/gnome-pdf.png share/pixmaps/gpdf/fitwidth.png +share/pixmaps/gpdf/stock_book-closed-mark.png +share/pixmaps/gpdf/stock_book-closed.png +share/pixmaps/gpdf/stock_book-opened-mark.png +share/pixmaps/gpdf/stock_book-opened.png +share/pixmaps/gpdf/stock_bookmarks.png +share/schemas/gpdf/gpdf.schemas +@dirrm share/schemas/gpdf @dirrm share/pixmaps/gpdf -@dirrm share/pixmaps -@dirrm share/mime-info -@dirrm share/locale/zh_TW/LC_MESSAGES -@dirrm share/locale/zh_TW -@dirrm share/locale/zh_CN/LC_MESSAGES -@dirrm share/locale/zh_CN -@dirrm share/locale/wa/LC_MESSAGES -@dirrm share/locale/wa -@dirrm share/locale/vi/LC_MESSAGES -@dirrm share/locale/vi -@dirrm share/locale/uk/LC_MESSAGES -@dirrm share/locale/uk -@dirrm share/locale/tr/LC_MESSAGES -@dirrm share/locale/tr -@dirrm share/locale/th/LC_MESSAGES -@dirrm share/locale/th -@dirrm share/locale/ta/LC_MESSAGES -@dirrm share/locale/ta -@dirrm share/locale/sv/LC_MESSAGES -@dirrm share/locale/sv -@dirrm share/locale/sr@Latn/LC_MESSAGES -@dirrm share/locale/sr@Latn -@dirrm share/locale/sr/LC_MESSAGES -@dirrm share/locale/sr -@dirrm share/locale/sq/LC_MESSAGES -@dirrm share/locale/sq -@dirrm share/locale/sk/LC_MESSAGES -@dirrm share/locale/sk -@dirrm share/locale/ru/LC_MESSAGES -@dirrm share/locale/ru -@dirrm share/locale/ro/LC_MESSAGES -@dirrm share/locale/ro -@dirrm share/locale/pt_BR/LC_MESSAGES -@dirrm share/locale/pt_BR -@dirrm share/locale/pt/LC_MESSAGES -@dirrm share/locale/pt -@dirrm share/locale/pl/LC_MESSAGES -@dirrm share/locale/pl -@dirrm share/locale/no/LC_MESSAGES -@dirrm share/locale/no -@dirrm share/locale/nn/LC_MESSAGES -@dirrm share/locale/nn -@dirrm share/locale/nl/LC_MESSAGES -@dirrm share/locale/nl -@dirrm share/locale/ms/LC_MESSAGES -@dirrm share/locale/ms -@dirrm share/locale/ml/LC_MESSAGES -@dirrm share/locale/ml -@dirrm share/locale/mk/LC_MESSAGES -@dirrm share/locale/mk -@dirrm share/locale/lv/LC_MESSAGES -@dirrm share/locale/lv -@dirrm share/locale/lt/LC_MESSAGES -@dirrm share/locale/lt -@dirrm share/locale/ko/LC_MESSAGES -@dirrm share/locale/ko -@dirrm share/locale/kn/LC_MESSAGES -@dirrm share/locale/kn -@dirrm share/locale/ja/LC_MESSAGES -@dirrm share/locale/ja -@dirrm share/locale/it/LC_MESSAGES -@dirrm share/locale/it -@dirrm share/locale/is/LC_MESSAGES -@dirrm share/locale/is -@dirrm share/locale/hu/LC_MESSAGES -@dirrm share/locale/hu -@dirrm share/locale/hi/LC_MESSAGES -@dirrm share/locale/hi -@dirrm share/locale/he/LC_MESSAGES -@dirrm share/locale/he -@dirrm share/locale/gl/LC_MESSAGES -@dirrm share/locale/gl -@dirrm share/locale/ga/LC_MESSAGES -@dirrm share/locale/ga -@dirrm share/locale/fr/LC_MESSAGES -@dirrm share/locale/fr -@dirrm share/locale/fi/LC_MESSAGES -@dirrm share/locale/fi -@dirrm share/locale/es/LC_MESSAGES -@dirrm share/locale/es -@dirrm share/locale/eo/LC_MESSAGES -@dirrm share/locale/eo -@dirrm share/locale/el/LC_MESSAGES -@dirrm share/locale/el -@dirrm share/locale/de/LC_MESSAGES -@dirrm share/locale/de -@dirrm share/locale/da/LC_MESSAGES -@dirrm share/locale/da -@dirrm share/locale/cy/LC_MESSAGES -@dirrm share/locale/cy -@dirrm share/locale/cs/LC_MESSAGES -@dirrm share/locale/cs -@dirrm share/locale/ca/LC_MESSAGES -@dirrm share/locale/ca -@dirrm share/locale/be/LC_MESSAGES -@dirrm share/locale/be -@dirrm share/locale/az/LC_MESSAGES -@dirrm share/locale/az -@dirrm share/locale/am/LC_MESSAGES -@dirrm share/locale/am -@dirrm share/locale +@dirrm share/omf/gpdf +@dirrm share/omf @dirrm share/gpdf/glade @dirrm share/gpdf +@dirrm share/gnome/help/gpdf/es/figures +@dirrm share/gnome/help/gpdf/es +@dirrm share/gnome/help/gpdf/de/figures +@dirrm share/gnome/help/gpdf/de +@dirrm share/gnome/help/gpdf/C/figures +@dirrm share/gnome/help/gpdf/C +@dirrm share/gnome/help/gpdf +@dirrm share/gnome/help +@dirrm share/gnome @dirrm share/applications -@dirrm share/application-registry -@dirrm lib/bonobo +@exec %D/bin/scrollkeeper-update -q +@unexec %D/bin/scrollkeeper-update -q +@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gpdf/*.schemas > /dev/null