From 6b4d7e48dceb4338ab96ba654e0830bf8acb6c19 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 18 Sep 2012 06:31:45 +0000 Subject: [PATCH] Bugfix update to glabels-3.0.1. --- productivity/glabels/Makefile | 36 ++-- productivity/glabels/distinfo | 7 +- .../glabels/patches/patch-help_Makefile_in | 15 -- productivity/glabels/pkg/PLIST | 157 ++++++++++++++++-- 4 files changed, 162 insertions(+), 53 deletions(-) delete mode 100644 productivity/glabels/patches/patch-help_Makefile_in diff --git a/productivity/glabels/Makefile b/productivity/glabels/Makefile index 94c4ccf4c8d..254bfa67a54 100644 --- a/productivity/glabels/Makefile +++ b/productivity/glabels/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.26 2012/09/01 14:36:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.27 2012/09/18 06:31:45 ajacoutot Exp $ COMMENT = labels and business card designer GNOME_PROJECT = glabels -GNOME_VERSION = 3.0.0 - -REVISION = 6 +GNOME_VERSION = 3.0.1 CATEGORIES = productivity graphics @@ -13,26 +11,24 @@ SHARED_LIBS += glabels-3.0 0.0 # 8.0 SHARED_LIBS += glbarcode-3.0 0.0 # 0.0 HOMEPAGE = http://glabels.sourceforge.net -EXTRACT_SUFX = .tar.gz # GPLv3/LGPLv3/MIT # Attribution-ShareAlike 3.0 Unported PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp -WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm asn1 -WANTLIB += atk-1.0 c cairo cairo-gobject camel-1.2 com_err croco-0.6 -WANTLIB += crypto drm ebook-1.2 edataserver-1.2 expat fontconfig -WANTLIB += freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gssapi gthread-2.0 gtk-3 krb5 -WANTLIB += m nspr4 nss3 nssutil3 pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm asn1 atk-1.0 c cairo +WANTLIB += cairo-gobject camel-1.2 com_err croco-0.6 crypto dbus-1 +WANTLIB += dbus-glib-1 drm ebook-1.2 edataserver-1.2 expat ffi +WANTLIB += fontconfig freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gio-2.0 +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gssapi gthread-2.0 +WANTLIB += gtk-3 krb5 m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs -WANTLIB += rsvg-2 smime3 soup-2.4 sqlite3 ssl3 xcb xcb-render -WANTLIB += xcb-shm xml2 z -WANTLIB += dbus-1 dbus-glib-1 ffi softokn3 stdc++ +WANTLIB += qrencode rsvg-2 smime3 softokn3 soup-2.4 sqlite3 ssl3 +WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 z zint MODULES = devel/gettext \ x11/gnome \ @@ -40,9 +36,11 @@ MODULES = devel/gettext \ BUILD_DEPENDS = graphics/barcode -LIB_DEPENDS = x11/gtk+3 \ - databases/evolution-data-server \ - x11/gnome/librsvg +LIB_DEPENDS = databases/evolution-data-server \ + graphics/libqrencode \ + graphics/zint \ + x11/gnome/librsvg \ + x11/gtk+3 RUN_DEPENDS = misc/shared-mime-info diff --git a/productivity/glabels/distinfo b/productivity/glabels/distinfo index 3dff977d020..f0e2096d47b 100644 --- a/productivity/glabels/distinfo +++ b/productivity/glabels/distinfo @@ -1,5 +1,2 @@ -MD5 (glabels-3.0.0.tar.gz) = p5XGCX2WIEBso5ZbT75wew== -RMD160 (glabels-3.0.0.tar.gz) = zSUux7nQ03cpFnwW17NSpqjrhq4= -SHA1 (glabels-3.0.0.tar.gz) = dGQ60VJwLp0ftzVZ7BmOSXeGva4= -SHA256 (glabels-3.0.0.tar.gz) = L8FwDIqFdd05pojPyAdw+AVOWEvkPNxg2gfklkFL2S8= -SIZE (glabels-3.0.0.tar.gz) = 3430966 +SHA256 (glabels-3.0.1.tar.xz) = mYEHBbn8sjTwhe1KxtvqUMxbIyxtjKBassBjRnP7m9I= +SIZE (glabels-3.0.1.tar.xz) = 3310944 diff --git a/productivity/glabels/patches/patch-help_Makefile_in b/productivity/glabels/patches/patch-help_Makefile_in deleted file mode 100644 index 6ea74d1292f..00000000000 --- a/productivity/glabels/patches/patch-help_Makefile_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-help_Makefile_in,v 1.1 2011/05/17 17:05:38 ajacoutot Exp $ - -This file is not used anymore and m4 will create a cyclic link to it -which will prevent packaging. - ---- help/Makefile.in.orig Tue May 17 11:28:47 2011 -+++ help/Makefile.in Tue May 17 11:28:54 2011 -@@ -385,7 +385,6 @@ DOC_FIGURES = \ - figures/glabels-template-layout.png \ - figures/glabels-template-rect-label.png \ - figures/introduction-glabels-main-window.png \ -- figures/main-window-empty.png \ - figures/merge-ex1-1.png \ - figures/merge-ex1-2.png \ - figures/merge-ex1-3.png \ diff --git a/productivity/glabels/pkg/PLIST b/productivity/glabels/pkg/PLIST index 328e46478c3..dd506830033 100644 --- a/productivity/glabels/pkg/PLIST +++ b/productivity/glabels/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2012/06/15 08:32:17 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.10 2012/09/18 06:31:45 ajacoutot Exp $ %%SHARED%% @bin bin/glabels-3 @bin bin/glabels-3-batch @@ -233,6 +233,49 @@ share/gnome/help/glabels-3.0/de/newlabel.page share/gnome/help/glabels-3.0/de/printfile.page share/gnome/help/glabels-3.0/de/select.page share/gnome/help/glabels-3.0/de/skipfields.page +share/gnome/help/glabels-3.0/el/ +share/gnome/help/glabels-3.0/el/about.page +share/gnome/help/glabels-3.0/el/basicusage.page +share/gnome/help/glabels-3.0/el/createnew.page +share/gnome/help/glabels-3.0/el/customize.page +share/gnome/help/glabels-3.0/el/customtemplate.page +share/gnome/help/glabels-3.0/el/editprop.page +share/gnome/help/glabels-3.0/el/figures/ +share/gnome/help/glabels-3.0/el/figures/glabels-logo.png +share/gnome/help/glabels-3.0/el/figures/glabels-template-cd-label.png +share/gnome/help/glabels-3.0/el/figures/glabels-template-circle-label.png +share/gnome/help/glabels-3.0/el/figures/glabels-template-ellipse-label.png +share/gnome/help/glabels-3.0/el/figures/glabels-template-layout.png +share/gnome/help/glabels-3.0/el/figures/glabels-template-rect-label.png +share/gnome/help/glabels-3.0/el/figures/introduction-glabels-main-window.png +share/gnome/help/glabels-3.0/el/figures/merge-ex1-1.png +share/gnome/help/glabels-3.0/el/figures/merge-ex1-2.png +share/gnome/help/glabels-3.0/el/figures/merge-ex1-3.png +share/gnome/help/glabels-3.0/el/figures/merge-ex1-4.png +share/gnome/help/glabels-3.0/el/figures/merge-ex2-1.png +share/gnome/help/glabels-3.0/el/figures/merge-ex2-2.png +share/gnome/help/glabels-3.0/el/figures/merge-ex2-3.png +share/gnome/help/glabels-3.0/el/figures/merge-ex2-4.png +share/gnome/help/glabels-3.0/el/figures/object-editor-sidebar.png +share/gnome/help/glabels-3.0/el/figures/print-copies.png +share/gnome/help/glabels-3.0/el/figures/print-merge.png +share/gnome/help/glabels-3.0/el/figures/skip-fields-output.png +share/gnome/help/glabels-3.0/el/figures/skip-fields-screenshot.png +share/gnome/help/glabels-3.0/el/index.page +share/gnome/help/glabels-3.0/el/labelprop.page +share/gnome/help/glabels-3.0/el/license.page +share/gnome/help/glabels-3.0/el/mancreate.page +share/gnome/help/glabels-3.0/el/merge-ex1.page +share/gnome/help/glabels-3.0/el/merge-ex2.page +share/gnome/help/glabels-3.0/el/merge-ex3.page +share/gnome/help/glabels-3.0/el/merge-ex4.page +share/gnome/help/glabels-3.0/el/merge.page +share/gnome/help/glabels-3.0/el/mergefeatures.page +share/gnome/help/glabels-3.0/el/multifile.page +share/gnome/help/glabels-3.0/el/newlabel.page +share/gnome/help/glabels-3.0/el/printfile.page +share/gnome/help/glabels-3.0/el/select.page +share/gnome/help/glabels-3.0/el/skipfields.page share/gnome/help/glabels-3.0/es/ share/gnome/help/glabels-3.0/es/about.page share/gnome/help/glabels-3.0/es/basicusage.page @@ -319,6 +362,49 @@ share/gnome/help/glabels-3.0/fr/newlabel.page share/gnome/help/glabels-3.0/fr/printfile.page share/gnome/help/glabels-3.0/fr/select.page share/gnome/help/glabels-3.0/fr/skipfields.page +share/gnome/help/glabels-3.0/id/ +share/gnome/help/glabels-3.0/id/about.page +share/gnome/help/glabels-3.0/id/basicusage.page +share/gnome/help/glabels-3.0/id/createnew.page +share/gnome/help/glabels-3.0/id/customize.page +share/gnome/help/glabels-3.0/id/customtemplate.page +share/gnome/help/glabels-3.0/id/editprop.page +share/gnome/help/glabels-3.0/id/figures/ +share/gnome/help/glabels-3.0/id/figures/glabels-logo.png +share/gnome/help/glabels-3.0/id/figures/glabels-template-cd-label.png +share/gnome/help/glabels-3.0/id/figures/glabels-template-circle-label.png +share/gnome/help/glabels-3.0/id/figures/glabels-template-ellipse-label.png +share/gnome/help/glabels-3.0/id/figures/glabels-template-layout.png +share/gnome/help/glabels-3.0/id/figures/glabels-template-rect-label.png +share/gnome/help/glabels-3.0/id/figures/introduction-glabels-main-window.png +share/gnome/help/glabels-3.0/id/figures/merge-ex1-1.png +share/gnome/help/glabels-3.0/id/figures/merge-ex1-2.png +share/gnome/help/glabels-3.0/id/figures/merge-ex1-3.png +share/gnome/help/glabels-3.0/id/figures/merge-ex1-4.png +share/gnome/help/glabels-3.0/id/figures/merge-ex2-1.png +share/gnome/help/glabels-3.0/id/figures/merge-ex2-2.png +share/gnome/help/glabels-3.0/id/figures/merge-ex2-3.png +share/gnome/help/glabels-3.0/id/figures/merge-ex2-4.png +share/gnome/help/glabels-3.0/id/figures/object-editor-sidebar.png +share/gnome/help/glabels-3.0/id/figures/print-copies.png +share/gnome/help/glabels-3.0/id/figures/print-merge.png +share/gnome/help/glabels-3.0/id/figures/skip-fields-output.png +share/gnome/help/glabels-3.0/id/figures/skip-fields-screenshot.png +share/gnome/help/glabels-3.0/id/index.page +share/gnome/help/glabels-3.0/id/labelprop.page +share/gnome/help/glabels-3.0/id/license.page +share/gnome/help/glabels-3.0/id/mancreate.page +share/gnome/help/glabels-3.0/id/merge-ex1.page +share/gnome/help/glabels-3.0/id/merge-ex2.page +share/gnome/help/glabels-3.0/id/merge-ex3.page +share/gnome/help/glabels-3.0/id/merge-ex4.page +share/gnome/help/glabels-3.0/id/merge.page +share/gnome/help/glabels-3.0/id/mergefeatures.page +share/gnome/help/glabels-3.0/id/multifile.page +share/gnome/help/glabels-3.0/id/newlabel.page +share/gnome/help/glabels-3.0/id/printfile.page +share/gnome/help/glabels-3.0/id/select.page +share/gnome/help/glabels-3.0/id/skipfields.page share/gnome/help/glabels-3.0/nl/ share/gnome/help/glabels-3.0/nl/about.page share/gnome/help/glabels-3.0/nl/basicusage.page @@ -362,6 +448,49 @@ share/gnome/help/glabels-3.0/nl/newlabel.page share/gnome/help/glabels-3.0/nl/printfile.page share/gnome/help/glabels-3.0/nl/select.page share/gnome/help/glabels-3.0/nl/skipfields.page +share/gnome/help/glabels-3.0/ru/ +share/gnome/help/glabels-3.0/ru/about.page +share/gnome/help/glabels-3.0/ru/basicusage.page +share/gnome/help/glabels-3.0/ru/createnew.page +share/gnome/help/glabels-3.0/ru/customize.page +share/gnome/help/glabels-3.0/ru/customtemplate.page +share/gnome/help/glabels-3.0/ru/editprop.page +share/gnome/help/glabels-3.0/ru/figures/ +share/gnome/help/glabels-3.0/ru/figures/glabels-logo.png +share/gnome/help/glabels-3.0/ru/figures/glabels-template-cd-label.png +share/gnome/help/glabels-3.0/ru/figures/glabels-template-circle-label.png +share/gnome/help/glabels-3.0/ru/figures/glabels-template-ellipse-label.png +share/gnome/help/glabels-3.0/ru/figures/glabels-template-layout.png +share/gnome/help/glabels-3.0/ru/figures/glabels-template-rect-label.png +share/gnome/help/glabels-3.0/ru/figures/introduction-glabels-main-window.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex1-1.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex1-2.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex1-3.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex1-4.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex2-1.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex2-2.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex2-3.png +share/gnome/help/glabels-3.0/ru/figures/merge-ex2-4.png +share/gnome/help/glabels-3.0/ru/figures/object-editor-sidebar.png +share/gnome/help/glabels-3.0/ru/figures/print-copies.png +share/gnome/help/glabels-3.0/ru/figures/print-merge.png +share/gnome/help/glabels-3.0/ru/figures/skip-fields-output.png +share/gnome/help/glabels-3.0/ru/figures/skip-fields-screenshot.png +share/gnome/help/glabels-3.0/ru/index.page +share/gnome/help/glabels-3.0/ru/labelprop.page +share/gnome/help/glabels-3.0/ru/license.page +share/gnome/help/glabels-3.0/ru/mancreate.page +share/gnome/help/glabels-3.0/ru/merge-ex1.page +share/gnome/help/glabels-3.0/ru/merge-ex2.page +share/gnome/help/glabels-3.0/ru/merge-ex3.page +share/gnome/help/glabels-3.0/ru/merge-ex4.page +share/gnome/help/glabels-3.0/ru/merge.page +share/gnome/help/glabels-3.0/ru/mergefeatures.page +share/gnome/help/glabels-3.0/ru/multifile.page +share/gnome/help/glabels-3.0/ru/newlabel.page +share/gnome/help/glabels-3.0/ru/printfile.page +share/gnome/help/glabels-3.0/ru/select.page +share/gnome/help/glabels-3.0/ru/skipfields.page share/gnome/help/glabels-3.0/sl/ share/gnome/help/glabels-3.0/sl/about.page share/gnome/help/glabels-3.0/sl/basicusage.page @@ -425,7 +554,6 @@ share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-paper.html share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-template.html share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-vendor.html share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml.html -share/gtk-doc/html/libglabels-3.0/libglabels-3.0.devhelp share/gtk-doc/html/libglabels-3.0/libglabels-3.0.devhelp2 share/gtk-doc/html/libglabels-3.0/right.png share/gtk-doc/html/libglabels-3.0/style.css @@ -440,29 +568,17 @@ share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html -share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0.devhelp share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0.devhelp2 share/gtk-doc/html/libglbarcode-3.0/libglbarcode-intro.html share/gtk-doc/html/libglbarcode-3.0/overview.html share/gtk-doc/html/libglbarcode-3.0/right.png share/gtk-doc/html/libglbarcode-3.0/style.css share/gtk-doc/html/libglbarcode-3.0/up.png -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/glabels-3.0.png -share/icons/hicolor/22x22/ -share/icons/hicolor/22x22/apps/ share/icons/hicolor/22x22/apps/glabels-3.0.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/ share/icons/hicolor/24x24/apps/glabels-3.0.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/glabels-3.0.png -share/icons/hicolor/48x48/ -share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/glabels-3.0.png -share/icons/hicolor/48x48/mimetypes/ share/icons/hicolor/48x48/mimetypes/application-x-glabels.png share/libglabels-3.0/ share/libglabels-3.0/dtd/ @@ -477,30 +593,41 @@ share/libglabels-3.0/templates/categories.xml share/libglabels-3.0/templates/databecker-iso-templates.xml share/libglabels-3.0/templates/dataline-iso-templates.xml share/libglabels-3.0/templates/decadry-iso-templates.xml +share/libglabels-3.0/templates/desmat-templates.xml share/libglabels-3.0/templates/dymo-other-templates.xml +share/libglabels-3.0/templates/endisch-templates.xml share/libglabels-3.0/templates/geha-iso-templates.xml share/libglabels-3.0/templates/hama-iso-templates.xml share/libglabels-3.0/templates/herma-iso-templates.xml +share/libglabels-3.0/templates/igepa-templates.xml share/libglabels-3.0/templates/jac-iso-templates.xml share/libglabels-3.0/templates/maco-us-templates.xml share/libglabels-3.0/templates/meritline-us-templates.xml +share/libglabels-3.0/templates/microapp-templates.xml share/libglabels-3.0/templates/misc-iso-templates.xml share/libglabels-3.0/templates/misc-other-templates.xml share/libglabels-3.0/templates/misc-us-templates.xml share/libglabels-3.0/templates/paper-sizes.xml share/libglabels-3.0/templates/pearl-iso-templates.xml +share/libglabels-3.0/templates/rayfilm-templates.xml +share/libglabels-3.0/templates/sheetlabels-us-templates.xml share/libglabels-3.0/templates/uline-us-templates.xml share/libglabels-3.0/templates/vendors.xml share/libglabels-3.0/templates/worldlabel-us-templates.xml share/libglabels-3.0/templates/zweckform-iso-templates.xml +share/locale/ar/LC_MESSAGES/glabels-3.0.mo share/locale/ca/LC_MESSAGES/glabels-3.0.mo share/locale/ca@valencia/LC_MESSAGES/glabels-3.0.mo share/locale/cs/LC_MESSAGES/glabels-3.0.mo share/locale/da/LC_MESSAGES/glabels-3.0.mo share/locale/de/LC_MESSAGES/glabels-3.0.mo +share/locale/el/LC_MESSAGES/glabels-3.0.mo +share/locale/en_GB/LC_MESSAGES/glabels-3.0.mo share/locale/eo/LC_MESSAGES/glabels-3.0.mo share/locale/es/LC_MESSAGES/glabels-3.0.mo +share/locale/fi/LC_MESSAGES/glabels-3.0.mo share/locale/fr/LC_MESSAGES/glabels-3.0.mo +share/locale/id/LC_MESSAGES/glabels-3.0.mo share/locale/it/LC_MESSAGES/glabels-3.0.mo share/locale/ja/LC_MESSAGES/glabels-3.0.mo share/locale/ko/LC_MESSAGES/glabels-3.0.mo @@ -511,6 +638,8 @@ share/locale/pt/LC_MESSAGES/glabels-3.0.mo share/locale/pt_BR/LC_MESSAGES/glabels-3.0.mo share/locale/ru/LC_MESSAGES/glabels-3.0.mo share/locale/sl/LC_MESSAGES/glabels-3.0.mo +share/locale/sr/LC_MESSAGES/glabels-3.0.mo +share/locale/sr@latin/LC_MESSAGES/glabels-3.0.mo share/locale/sv/LC_MESSAGES/glabels-3.0.mo share/locale/zh_CN/LC_MESSAGES/glabels-3.0.mo share/locale/zh_TW/LC_MESSAGES/glabels-3.0.mo