diff --git a/x11/gnome/glom/Makefile b/x11/gnome/glom/Makefile index cc4928d0987..13d00032a69 100644 --- a/x11/gnome/glom/Makefile +++ b/x11/gnome/glom/Makefile @@ -1,16 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2011/10/18 18:08:16 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2011/10/19 08:06:31 jasper Exp $ COMMENT= GNOME database designer and user interface GNOME_PROJECT= glom -GNOME_VERSION= 1.19.13 - -REVISION= 0 - -# XXX https://bugzilla.gnome.org/show_bug.cgi?id=619445 -PATCHFILES= glom_locale.patch:0 -MASTER_SITES0= http://distfiles.bsdfrog.org/ -PATCH_DIST_STRIP= -p1 +GNOME_VERSION= 1.19.14 SHARED_LIBS += glom-1.20 0.0 # 0.0 diff --git a/x11/gnome/glom/distinfo b/x11/gnome/glom/distinfo index 156df953d0e..210cd0325c6 100644 --- a/x11/gnome/glom/distinfo +++ b/x11/gnome/glom/distinfo @@ -1,10 +1,5 @@ -MD5 (gnome/glom-1.19.13.tar.xz) = NTGuWFhvLkJlFkRjR6GfqQ== -MD5 (gnome/glom_locale.patch) = u4ezDZ1eHi86gL2NMC2KtA== -RMD160 (gnome/glom-1.19.13.tar.xz) = li3NRhFMp1PY2zo0aw8edDn01DI= -RMD160 (gnome/glom_locale.patch) = 1T9xHTC66olyihGRyle9uqfNiEk= -SHA1 (gnome/glom-1.19.13.tar.xz) = t91GnRVf7gb+ELVDijY4KE/OUuM= -SHA1 (gnome/glom_locale.patch) = 83VWojeIBCVwTmP/RyUXb29i5Uo= -SHA256 (gnome/glom-1.19.13.tar.xz) = U5ThgSC9FDaMUbdKCstMUsqJF7fUSfmqXGH2fz2fHKg= -SHA256 (gnome/glom_locale.patch) = t1XxSaoZzXT1mEEQnVHAh9zRcdhdxFYK6NoCswUNuK0= -SIZE (gnome/glom-1.19.13.tar.xz) = 8264468 -SIZE (gnome/glom_locale.patch) = 7587 +MD5 (gnome/glom-1.19.14.tar.xz) = z8LICAzrdXckuFdcMyOM+A== +RMD160 (gnome/glom-1.19.14.tar.xz) = D8c6vrD5JaraWhCAk6pYrhR1418= +SHA1 (gnome/glom-1.19.14.tar.xz) = KFxfMlxLmhL0lg6FXYgbbUd+hgE= +SHA256 (gnome/glom-1.19.14.tar.xz) = GNu/VyBFOAwH+2yyvbyhiTu9Mi+xKD4fDQ0rKVtKKMg= +SIZE (gnome/glom-1.19.14.tar.xz) = 5433568 diff --git a/x11/gnome/glom/patches/patch-Makefile_in b/x11/gnome/glom/patches/patch-Makefile_in index 10a21281bdc..a6b8494d189 100644 --- a/x11/gnome/glom/patches/patch-Makefile_in +++ b/x11/gnome/glom/patches/patch-Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2011/10/15 07:38:10 jasper Exp $ +$OpenBSD: patch-Makefile_in,v 1.2 2011/10/19 08:06:31 jasper Exp $ Remove -dl linking, which won't work on OpenBSD. ---- Makefile.in.orig Sat Oct 15 09:22:55 2011 -+++ Makefile.in Sat Oct 15 09:23:05 2011 -@@ -2590,7 +2590,7 @@ tests_test_signal_reemit_SOURCES = tests/test_signal_r +--- Makefile.in.orig Tue Oct 18 22:17:23 2011 ++++ Makefile.in Tue Oct 18 23:30:03 2011 +@@ -2620,7 +2620,7 @@ tests_test_signal_reemit_SOURCES = tests/test_signal_r tests_test_signal_reemit_LDADD = $(LIBGLOM_LIBS) tests_test_signal_reemit_CPPFLAGS = $(tests_cppflags) tests_python_test_load_python_library_SOURCES = tests/python/test_load_python_library.cc diff --git a/x11/gnome/glom/patches/patch-glom_libglom_glom_pc_in b/x11/gnome/glom/patches/patch-glom_libglom_glom_pc_in deleted file mode 100644 index d7bece6bc8d..00000000000 --- a/x11/gnome/glom/patches/patch-glom_libglom_glom_pc_in +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-glom_libglom_glom_pc_in,v 1.1 2011/10/18 18:08:16 jasper Exp $ - -From 359137ed5a02a358467921f2aa5a7791d41af204 Mon Sep 17 00:00:00 2001 -From: Murray Cumming -Date: Tue, 18 Oct 2011 08:57:39 +0000 -Subject: Correct the pkg-config file. - ---- glom/libglom/glom.pc.in.orig Tue Oct 18 20:00:56 2011 -+++ glom/libglom/glom.pc.in Tue Oct 18 20:01:06 2011 -@@ -8,7 +8,7 @@ exampledir=@docdir@/examples - - Name: libglom - Description: Library for accessing Glom documents and data structures. --Requires: glibmm-2.4 giomm-2.4 libgdamm-4.0 libxml++-2.6 -+Requires: glibmm-2.4 giomm-2.4 libgdamm-5.0 libxml++-2.6 libxslt - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lglom-@GLOM_ABI_VERSION@ - Cflags: -I${includedir}/glom-@GLOM_ABI_VERSION@ diff --git a/x11/gnome/glom/pkg/PLIST b/x11/gnome/glom/pkg/PLIST index 07b4c2cee60..b5e907887fe 100644 --- a/x11/gnome/glom/pkg/PLIST +++ b/x11/gnome/glom/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2011/10/10 20:14:17 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2011/10/19 08:06:31 jasper Exp $ @bin bin/glom @bin bin/glom_create_from_example include/glom-${API_V}/ @@ -56,6 +56,7 @@ include/glom-${API_V}/libglom/document/document.h include/glom-${API_V}/libglom/document/view.h include/glom-${API_V}/libglom/init.h include/glom-${API_V}/libglom/libglom_config.h +include/glom-${API_V}/libglom/report_builder.h include/glom-${API_V}/libglom/sharedptr.h include/glom-${API_V}/libglom/standard_table_prefs_fields.h include/glom-${API_V}/libglom/utils.h @@ -104,13 +105,18 @@ share/doc/libglom-${API_V}/reference/html/classGlomBakery_1_1View__coll__graph.p share/doc/libglom-${API_V}/reference/html/classGlomBakery_1_1View__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1AppState-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1AppState.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1AppState__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1CustomTitle-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1CustomTitle.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1CustomTitle__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1CustomTitle__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document_1_1DocumentTableInfo-members.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document_1_1DocumentTableInfo.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document_1_1DocumentTableInfo__coll__graph.png +share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document_1_1LayoutInfo-members.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document_1_1LayoutInfo.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document_1_1LayoutInfo__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Document__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Field-members.html @@ -121,7 +127,6 @@ share/doc/libglom-${API_V}/reference/html/classGlom_1_1FieldFormatting__coll__gr share/doc/libglom-${API_V}/reference/html/classGlom_1_1FieldFormatting__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1FieldTypes-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1FieldTypes.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1FieldTypes__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Field__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Field__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1FoundSet-members.html @@ -141,6 +146,8 @@ share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutGroup__coll__graph. share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutGroup__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem_1_1PrintLayoutPosition-members.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem_1_1PrintLayoutPosition.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem__Button-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem__Button.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1LayoutItem__Button__coll__graph.png @@ -212,7 +219,6 @@ share/doc/libglom-${API_V}/reference/html/classGlom_1_1NumericFormat.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1NumericFormat__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1ParameterNameGenerator-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1ParameterNameGenerator.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1ParameterNameGenerator__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1PrintLayout-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1PrintLayout.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1PrintLayout__coll__graph.png @@ -225,6 +231,8 @@ share/doc/libglom-${API_V}/reference/html/classGlom_1_1Relationship__coll__graph share/doc/libglom-${API_V}/reference/html/classGlom_1_1Relationship__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Report-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1Report.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1ReportBuilder-members.html +share/doc/libglom-${API_V}/reference/html/classGlom_1_1ReportBuilder.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1Report__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1Report__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1SystemPrefs-members.html @@ -236,18 +244,14 @@ share/doc/libglom-${API_V}/reference/html/classGlom_1_1TableInfo__coll__graph.pn share/doc/libglom-${API_V}/reference/html/classGlom_1_1TableInfo__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1TranslatableItem-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1TranslatableItem.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1TranslatableItem__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1TranslatableItem__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1UsesRelationship-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1UsesRelationship.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1UsesRelationship__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1UsesRelationship__inherit__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1predicate__FieldHasName-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1predicate__FieldHasName.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1predicate__FieldHasName__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1predicate__LayoutItem__Field__IsSameField-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1predicate__LayoutItem__Field__IsSameField.html -share/doc/libglom-${API_V}/reference/html/classGlom_1_1predicate__LayoutItem__Field__IsSameField__coll__graph.png share/doc/libglom-${API_V}/reference/html/classGlom_1_1sharedptr-members.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1sharedptr.html share/doc/libglom-${API_V}/reference/html/classGlom_1_1sharedptr__inherit__graph.png @@ -309,6 +313,11 @@ share/doc/libglom-${API_V}/reference/html/inherit_graph_1.png share/doc/libglom-${API_V}/reference/html/inherit_graph_10.png share/doc/libglom-${API_V}/reference/html/inherit_graph_11.png share/doc/libglom-${API_V}/reference/html/inherit_graph_12.png +share/doc/libglom-${API_V}/reference/html/inherit_graph_13.png +share/doc/libglom-${API_V}/reference/html/inherit_graph_14.png +share/doc/libglom-${API_V}/reference/html/inherit_graph_15.png +share/doc/libglom-${API_V}/reference/html/inherit_graph_16.png +share/doc/libglom-${API_V}/reference/html/inherit_graph_17.png share/doc/libglom-${API_V}/reference/html/inherit_graph_2.png share/doc/libglom-${API_V}/reference/html/inherit_graph_3.png share/doc/libglom-${API_V}/reference/html/inherit_graph_4.png @@ -428,7 +437,6 @@ share/glom/pixmaps/glom-notebook.png share/glom/pixmaps/glom-related-records.png share/glom/pixmaps/glom-text.png share/glom/xslt/ -share/glom/xslt/print_details_to_html.xsl share/glom/xslt/print_report_to_html.xsl share/gnome/help/glom/ share/gnome/help/glom/C/