[120079] trunk/dports/gnome/libgtkhtml3
devans at macports.org
devans at macports.org
Wed May 14 16:39:01 PDT 2014
Revision: 120079
https://trac.macports.org/changeset/120079
Author: devans at macports.org
Date: 2014-05-14 16:39:01 -0700 (Wed, 14 May 2014)
Log Message:
-----------
libgtkhtml3: update m4/intltool.m4 and autoreconf to fix intltool configuration, add +glade variant to enable build of glade3 catalog items.
Modified Paths:
--------------
trunk/dports/gnome/libgtkhtml3/Portfile
Added Paths:
-----------
trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff
trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff
trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff
Removed Paths:
-------------
trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff
Modified: trunk/dports/gnome/libgtkhtml3/Portfile
===================================================================
--- trunk/dports/gnome/libgtkhtml3/Portfile 2014-05-14 23:02:47 UTC (rev 120078)
+++ trunk/dports/gnome/libgtkhtml3/Portfile 2014-05-14 23:39:01 UTC (rev 120079)
@@ -6,7 +6,7 @@
name libgtkhtml3
set my_name gtkhtml
version 3.32.2
-revision 4
+revision 5
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers nomaintainer
@@ -42,12 +42,31 @@
depends_run port:gnome-icon-theme
-patchfiles patch-configure.diff
+patchfiles patch-configure.ac.diff \
+ patch-components-editor-Makefile.am.diff \
+ patch-gtkhtml-editor.xml.diff
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.args --enable-deprecated-warning-flags=no \
+ --disable-silent-rules
+
test.run yes
test.dir $worksrcpath/gtkhtml
test.target test-verbose
+variant glade description {Build glade widget catalog} {
+ depends_lib-append port:glade3
+ configure.args-append --with-glade-catalog
+}
+
livecheck.type gnome
livecheck.name ${my_name}
livecheck.regex {LATEST-IS-(3\.\d*[02468](?:\.\d+)*)}
Added: trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff 2014-05-14 23:39:01 UTC (rev 120079)
@@ -0,0 +1,11 @@
+--- components/editor/Makefile.am.orig 2014-05-14 16:22:58.000000000 -0700
++++ components/editor/Makefile.am 2014-05-14 16:24:07.000000000 -0700
+@@ -138,7 +138,7 @@
+ gtkhtml-color-swatch.c \
+ gtkhtml-combo-box.c
+
+-libglade_gtkhtml_editor_la_LDFLAGS = -module -avoid-version -no-undefined
++libglade_gtkhtml_editor_la_LDFLAGS = -module -avoid-version
+
+ libglade_gtkhtml_editor_la_LIBADD = @GTKHTML_CFLAGS@
+
Added: trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff 2014-05-14 23:39:01 UTC (rev 120079)
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2014-05-14 14:51:10.000000000 -0700
++++ configure.ac 2014-05-14 14:52:07.000000000 -0700
+@@ -174,7 +174,7 @@
+ dnl **********************************
+ dnl GTKHTML modules
+ dnl **********************************
+-GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
++GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 gthread-2.0 iso-codes"
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
Deleted: trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff 2014-05-14 23:02:47 UTC (rev 120078)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff 2014-05-14 23:39:01 UTC (rev 120079)
@@ -1,24 +0,0 @@
---- configure.orig 2011-02-05 22:12:31.000000000 -0600
-+++ configure 2012-04-30 12:35:34.000000000 -0500
-@@ -5761,11 +5761,8 @@
-
- if test "x${enable_deprecated_flags}" = "xyes"; then
-
-- list="-DG_DISABLE_DEPRECATED
-- -DPANGO_DISABLE_DEPRECATED
-- -DGDK_DISABLE_DEPRECATED
-+ list="-DPANGO_DISABLE_DEPRECATED
- -DGDK_PIXBUF_DISABLE_DEPRECATED
-- -DGTK_DISABLE_DEPRECATED
- -DGNOME_DISABLE_DEPRECATED"
- flags_supported=""
- flags_unsupported=""
-@@ -17350,7 +17350,7 @@ fi
-
-
-
--GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= 1.1.7 gconf-2.0 iso-codes"
-+GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= 1.1.7 gconf-2.0 gthread-2.0 iso-codes"
-
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKHTML" >&5
Added: trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff
===================================================================
--- trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff 2014-05-14 23:39:01 UTC (rev 120079)
@@ -0,0 +1,43 @@
+From 6319f07b1cb4d4aabe4741a9ecc941378f1896fe Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Mon, 5 Oct 2009 21:41:23 -0500
+Subject: Restore Glade catalog file.
+
+
+diff --git a/components/editor/gtkhtml-editor.xml b/components/editor/gtkhtml-editor.xml
+new file mode 100644
+index 0000000..cd91de3
+--- /dev/null
++++ components/editor/gtkhtml-editor.xml
+@@ -0,0 +1,28 @@
++<glade-catalog name="gtkhtml-editor" library="glade-gtkhtml-editor" depends="gtk+">
++
++ <glade-widget-classes>
++ <glade-widget-class name="GtkhtmlColorCombo" generic-name="color-combo" title="Color Combo Box">
++ <properties>
++ <property id="color"/>
++ <property id="popup-shown"/>
++ </properties>
++ </glade-widget-class>
++ <glade-widget-class name="GtkhtmlColorSwatch" generic-name="color-swatch" title="Color Swatch">
++ <properties>
++ <property id="color"/>
++ </properties>
++ </glade-widget-class>
++ <glade-widget-class name="GtkhtmlComboBox" generic-name="combo-box" title="Radio Action Combo Box">
++ <properties>
++ <property id="action"/>
++ </properties>
++ </glade-widget-class>
++ </glade-widget-classes>
++
++ <glade-widget-group name="widgets" title="GtkHTML Editor">
++ <glade-widget-class-ref name="GtkhtmlColorCombo"/>
++ <glade-widget-class-ref name="GtkhtmlColorSwatch"/>
++ <glade-widget-class-ref name="GtkhtmlComboBox"/>
++ </glade-widget-group>
++
++</glade-catalog>
+--
+cgit v0.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140514/e639a560/attachment.html>
More information about the macports-changes
mailing list