From c1231ca238877237a34896a652704dffc8868fa2 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 29 Mar 2013 13:19:36 +0000 Subject: [PATCH] - update to a recent git clone which fixes loads of deprecation warnings and drops the user of two deprecated libs. ok aja@ --- x11/gnome/planner/Makefile | 57 ++++++++++-------- x11/gnome/planner/distinfo | 4 +- .../patches/patch-libplanner_mrp-time_c | 8 +-- x11/gnome/planner/pkg/PLIST | 58 +++++++++++++++++-- 4 files changed, 94 insertions(+), 33 deletions(-) diff --git a/x11/gnome/planner/Makefile b/x11/gnome/planner/Makefile index 5477ff76ccf..95c44c760a2 100755 --- a/x11/gnome/planner/Makefile +++ b/x11/gnome/planner/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.54 2013/03/11 11:46:11 espie Exp $ +# $OpenBSD: Makefile,v 1.55 2013/03/29 13:19:36 jasper Exp $ COMMENT= project management application GNOME_PROJECT= planner -GNOME_VERSION= 0.14.6 -REVISION= 2 +GNOME_VERSION= 0.14.6.1 CATEGORIES= productivity @@ -15,31 +14,26 @@ HOMEPAGE= http://live.gnome.org/Planner # LGPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite -WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender Xxf86vm art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation -WANTLIB += bonoboui-2 c cairo canberra crypto dbus-1 dbus-glib-1 -WANTLIB += drm expat exslt fontconfig freetype gailutil gcrypt +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB += Xrandr Xrender art_lgpl_2 atk-1.0 c cairo dbus-1 dbus-glib-1 +WANTLIB += expat exslt ffi fontconfig freetype gailutil gcrypt WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 -WANTLIB += gnomevfs-2 gobject-2.0 gpg-error gthread-2.0 gtk-x11-2.0 -WANTLIB += ltdl m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre -WANTLIB += pixman-1 png popt pthread pthread-stubs ssl util vorbis -WANTLIB += vorbisfile xcb xcb-render xcb-shm xml2 xslt z ffi stdc++ -WANTLIB += ${MODPY_WANTLIB} +WANTLIB += gmodule-2.0 gnomecanvas-2 gobject-2.0 gpg-error graphite2 +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz icudata icule icuuc +WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm xml2 +WANTLIB += xslt z MODULES= devel/gettext \ - lang/python \ x11/gnome \ devel/gconf2 BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= x11/py-gtk2 \ - misc/shared-mime-info>=0.21 +RUN_DEPENDS= misc/shared-mime-info>=0.21 -LIB_DEPENDS= x11/gnome/libbonoboui \ - x11/gnome/libgnomeui \ - ${MODPY_LIB_DEPENDS} +LIB_DEPENDS= security/libgcrypt \ + textproc/libxslt \ + x11/gnome/libgnomecanvas MODGNOME_TOOLS= yelp MODGNOME_DESKTOP_FILE= Yes @@ -47,16 +41,33 @@ MODGNOME_ICON_CACHE= Yes MODGCONF2_SCHEMAS_DIR= planner CONFIGURE_ARGS+= --disable-update-mimedb \ - --enable-python \ - --enable-python-plugin=yes \ + --disable-python \ --enable-eds=no \ --enable-eds-backend=no \ --with-database=no CONFIGURE_ENV= UPDATE_DESKTOP_DATABASE="/usr/bin/false" +############################################################ +# XXX: Remove the following when updating to a real release. +MASTER_SITES= http://distfiles.nl/ +BUILD_DEPENDS += x11/gnome/common \ + ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/libtool + +AUTOMAKE_VERSION = 1.9 +AUTOCONF_VERSION = 2.68 + +do-configure: + cd ${WRKSRC} && \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + env ${CONFIGURE_ENV} \ + ./autogen.sh ${CONFIGURE_ARGS} +############################################################ + post-install: rm ${PREFIX}/lib/planner/{file-modules,plugins,storage-modules}/*.{a,la} - rm ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/*.{a,la} .include diff --git a/x11/gnome/planner/distinfo b/x11/gnome/planner/distinfo index 0e9fc676038..bf9d57d67fc 100644 --- a/x11/gnome/planner/distinfo +++ b/x11/gnome/planner/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/planner-0.14.6.tar.xz) = Ew0p5ta4wZlAF966KsygWkv4O6HhaWNeyMXHh4q+BpY= -SIZE (gnome/planner-0.14.6.tar.xz) = 3392796 +SHA256 (gnome/planner-0.14.6.1.tar.xz) = TfnTeUvIGsrdc52T/95UHnzlYrrVE2YHK2bR9vd+azY= +SIZE (gnome/planner-0.14.6.1.tar.xz) = 3858448 diff --git a/x11/gnome/planner/patches/patch-libplanner_mrp-time_c b/x11/gnome/planner/patches/patch-libplanner_mrp-time_c index ebb1b1932ab..d136edb3078 100644 --- a/x11/gnome/planner/patches/patch-libplanner_mrp-time_c +++ b/x11/gnome/planner/patches/patch-libplanner_mrp-time_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-libplanner_mrp-time_c,v 1.2 2011/07/05 07:48:52 jasper Exp $ +$OpenBSD: patch-libplanner_mrp-time_c,v 1.3 2013/03/29 13:19:36 jasper Exp $ Fix calendar calculation: UTC cannot have DST. ---- libplanner/mrp-time.c.orig Mon Jul 4 19:51:22 2011 -+++ libplanner/mrp-time.c Mon Jul 4 19:51:45 2011 -@@ -171,6 +171,7 @@ mrp_time_from_tm (struct tm *tm) +--- libplanner/mrp-time.c.orig Fri Mar 29 11:02:43 2013 ++++ libplanner/mrp-time.c Fri Mar 29 12:56:01 2013 +@@ -173,6 +173,7 @@ mrp_time_from_tm (struct tm *tm) /* This is a hack. Set the timezone to UTC temporarily. */ old_tz = g_strdup (g_getenv ("TZ")); g_setenv ("TZ", "UTC", TRUE); diff --git a/x11/gnome/planner/pkg/PLIST b/x11/gnome/planner/pkg/PLIST index 8f8e060bd21..a39cac5923b 100644 --- a/x11/gnome/planner/pkg/PLIST +++ b/x11/gnome/planner/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2013/02/06 14:23:07 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.18 2013/03/29 13:19:36 jasper Exp $ @bin bin/planner include/planner-1.0/ include/planner-1.0/libplanner/ @@ -22,6 +22,7 @@ include/planner-1.0/libplanner/planner.h lib/libplanner-1.a lib/libplanner-1.la @lib lib/libplanner-1.so.${LIBplanner-1_VERSION} +lib/pkgconfig/ lib/pkgconfig/libplanner-1.pc lib/planner/ lib/planner/file-modules/ @@ -30,12 +31,9 @@ lib/planner/file-modules/libmrp-xsl.so lib/planner/plugins/ lib/planner/plugins/libhtml-plugin.so lib/planner/plugins/libmsp-plugin.so -lib/planner/plugins/libpython-plugin.so lib/planner/plugins/libxmlplanner-plugin.so lib/planner/storage-modules/ lib/planner/storage-modules/libstorage-mrproject-1.so -lib/python${MODPY_VERSION}/site-packages/planner.so -lib/python${MODPY_VERSION}/site-packages/plannerui.so @man man/man1/planner.1 share/applications/planner.desktop share/doc/planner/ @@ -94,6 +92,53 @@ share/gnome/help/planner/C/figures/task-up.png share/gnome/help/planner/C/figures/task-view.png share/gnome/help/planner/C/legal.xml share/gnome/help/planner/C/planner.xml +share/gnome/help/planner/es/ +share/gnome/help/planner/es/figures/ +share/gnome/help/planner/es/figures/calendar-new.png +share/gnome/help/planner/es/figures/calendar-week.png +share/gnome/help/planner/es/figures/calendar-working-time.png +share/gnome/help/planner/es/figures/calendar.png +share/gnome/help/planner/es/figures/day-types.png +share/gnome/help/planner/es/figures/gantt-view.png +share/gnome/help/planner/es/figures/group1-subtask-dialog.png +share/gnome/help/planner/es/figures/group1-subtasks.png +share/gnome/help/planner/es/figures/group1-task-linked.png +share/gnome/help/planner/es/figures/group1-task-linking.png +share/gnome/help/planner/es/figures/group1-task.png +share/gnome/help/planner/es/figures/group1-tasks-linked.png +share/gnome/help/planner/es/figures/new-project.png +share/gnome/help/planner/es/figures/print-project-paper.png +share/gnome/help/planner/es/figures/print-project-selectviews.png +share/gnome/help/planner/es/figures/print-project.png +share/gnome/help/planner/es/figures/project-properties-custom-add.png +share/gnome/help/planner/es/figures/project-properties-custom.png +share/gnome/help/planner/es/figures/project-properties.png +share/gnome/help/planner/es/figures/project-zoom-fit.png +share/gnome/help/planner/es/figures/project-zoom-up.png +share/gnome/help/planner/es/figures/resource-editor-sorted.png +share/gnome/help/planner/es/figures/resource-editor.png +share/gnome/help/planner/es/figures/resource-group-editor.png +share/gnome/help/planner/es/figures/resource-insert.png +share/gnome/help/planner/es/figures/resource-properties-calendar.png +share/gnome/help/planner/es/figures/resource-properties-general.png +share/gnome/help/planner/es/figures/several-projects.png +share/gnome/help/planner/es/figures/task-constraints.png +share/gnome/help/planner/es/figures/task-custom-properties-add.png +share/gnome/help/planner/es/figures/task-custom-properties.png +share/gnome/help/planner/es/figures/task-edit-advanced.png +share/gnome/help/planner/es/figures/task-edit-note.png +share/gnome/help/planner/es/figures/task-edit-predecessors-add-remove.png +share/gnome/help/planner/es/figures/task-edit-predecessors-add.png +share/gnome/help/planner/es/figures/task-edit-predecessors.png +share/gnome/help/planner/es/figures/task-edit-resource-assigned.png +share/gnome/help/planner/es/figures/task-edit-resources.png +share/gnome/help/planner/es/figures/task-edit.png +share/gnome/help/planner/es/figures/task-insert.png +share/gnome/help/planner/es/figures/task-properties-dialog.png +share/gnome/help/planner/es/figures/task-up.png +share/gnome/help/planner/es/figures/task-view.png +share/gnome/help/planner/es/legal.xml +share/gnome/help/planner/es/planner.xml share/gnome/help/planner/eu/ share/gnome/help/planner/eu/figures/ share/gnome/help/planner/eu/figures/calendar-new.png @@ -207,7 +252,10 @@ share/locale/sk/LC_MESSAGES/planner.mo share/locale/sl/LC_MESSAGES/planner.mo share/locale/sq/LC_MESSAGES/planner.mo share/locale/sr/LC_MESSAGES/planner.mo +share/locale/sr@Latn/ +share/locale/sr@Latn/LC_MESSAGES/ share/locale/sr@Latn/LC_MESSAGES/planner.mo +share/locale/sr@latin/LC_MESSAGES/planner.mo share/locale/sv/LC_MESSAGES/planner.mo share/locale/ta/LC_MESSAGES/planner.mo share/locale/tr/LC_MESSAGES/planner.mo @@ -220,7 +268,9 @@ share/mime/packages/planner.xml share/omf/ share/omf/planner/ share/omf/planner/planner-C.omf +share/omf/planner/planner-es.omf share/omf/planner/planner-eu.omf +share/pixmaps/ share/pixmaps/gnome-planner.png share/planner/ share/planner/dtd/