Attachment 151158 Details for Bug 196404 – Patch to update to 3.8.5

[patch] Patch to update to 3.8.5

patch-glade3.diff (text/plain), 15.02 KB, created by Kevin Zheng on 2014-12-31 16:47:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2014-12-31 16:47:19 UTC

Size: 15.02 KB

patch

obsolete

>diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
>index 5d7c208..a1c5169 100644
>--- a/devel/glade3/Makefile
>+++ b/devel/glade3/Makefile
>@@ -3,14 +3,13 @@
> #   $MCom: ports/trunk/devel/glade3/Makefile 17268 2013-04-01 05:13:11Z marcus $
> 
> PORTNAME=	glade3
>-PORTVERSION=	3.8.3
>-PORTREVISION=	3
>+PORTVERSION=	3.8.5
> CATEGORIES=	devel gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
> 
> MAINTAINER=	gnome@FreeBSD.org
>-COMMENT=	User interface builder for GTK+/GNOME
>+COMMENT=	User interface builder for Gtk+ 2
> 
> CONFLICTS=	glade-3.*
> PORTSCOUT=	ignore
>@@ -30,27 +29,21 @@ DOCSDIR=	${PREFIX}/share/doc/gladeui
> OPTIONS_DEFINE=	GNOME PYTHON
> OPTIONS_DEFAULT=PYTHON
> GNOME_DESC=	GNOME UI widget support
>+OPTIONS_SUB=	yes
>+
>+GNOME_CONFIGURE_ENABLE=	gnome
>+PYTHON_CONFIGURE_ENABLE=	python
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGNOME}
> USE_GNOME+=	libgnomeui
>-CONFIGURE_ARGS+=--enable-gnome
> PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gnome
>-PLIST_SUB+=	GNOME:=""
>-.else
>-CONFIGURE_ARGS+=--disable-gnome
>-PLIST_SUB+=	GNOME:="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MPYTHON}
> USES+=		python
> USE_GNOME+=	pygtk2
>-PLIST_SUB+=	PYTHON:=""
>-CONFIGURE_ARGS+=--enable-python
>-.else
>-CONFIGURE_ARGS+=--disable-python
>-PLIST_SUB+=	PYTHON:="@comment "
> .endif
> 
> post-install:
>diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
>index ec36670..b3a5fe0 100644
>--- a/devel/glade3/distinfo
>+++ b/devel/glade3/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (gnome2/glade3-3.8.3.tar.xz) = 84bb2d7f782f203e4aab923e47db8d22529229b13e59570945261611c63941d6
>-SIZE (gnome2/glade3-3.8.3.tar.xz) = 2306804
>+SHA256 (gnome2/glade3-3.8.5.tar.xz) = 58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735
>+SIZE (gnome2/glade3-3.8.5.tar.xz) = 2322076
>diff --git a/devel/glade3/files/patch-configure b/devel/glade3/files/patch-configure
>index f7b30f8..947398a 100644
>--- a/devel/glade3/files/patch-configure
>+++ b/devel/glade3/files/patch-configure
>@@ -1,6 +1,15 @@
>---- configure.orig	2011-03-03 13:42:44.000000000 +0100
>-+++ configure	2011-03-03 13:44:03.000000000 +0100
>-@@ -14138,7 +14138,7 @@
>+--- configure.orig	2014-09-19 03:53:39 UTC
>++++ configure
>+@@ -13652,8 +13652,6 @@
>+         -Werror=implicit-function-declaration \
>+         -Werror=pointer-arith \
>+         -Werror=init-self \
>+-        -Werror=format-security \
>+-        -Werror=format=2 \
>+         -Werror=missing-include-dirs \
>+     "
>+ 
>+@@ -15530,7 +15528,7 @@
>  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
>  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
>  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
>@@ -9,7 +18,7 @@
>    PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
>    if test "$py_prefix" != "$py_exec_prefix"; then
>      PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
>-@@ -14167,10 +14167,10 @@
>+@@ -15559,10 +15557,10 @@
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to embed python" >&5
>  $as_echo_n "checking for libraries required to embed python... " >&6; }
>  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
>diff --git a/devel/glade3/pkg-descr b/devel/glade3/pkg-descr
>index b74a724..18cdc06 100644
>--- a/devel/glade3/pkg-descr
>+++ b/devel/glade3/pkg-descr
>@@ -1,5 +1,8 @@
> Glade is a RAD tool to enable quick & easy development of user interfaces
>-for GTK+/GNOME.  It can generate the C source code needed to create
>-the interfaces designed within Glade's interface editor.
>+for the GTK+ toolkit and the GNOME desktop environment. The user interfaces
>+designed in Glade are saved as XML, and by using the GtkBuilder GTK+ object
>+these can be loaded by applications dynamically as needed.
>+
>+This version of Glade targets Gtk+ 2.
> 
> WWW: http://glade.gnome.org/
>diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
>index bad6617..d35a7ab 100644
>--- a/devel/glade3/pkg-plist
>+++ b/devel/glade3/pkg-plist
>@@ -42,6 +42,7 @@ include/libgladeui-1.0/gladeui/glade-property.h
> include/libgladeui-1.0/gladeui/glade-signal-editor.h
> include/libgladeui-1.0/gladeui/glade-signal.h
> include/libgladeui-1.0/gladeui/glade-store-editor.h
>+include/libgladeui-1.0/gladeui/glade-string-list.h
> include/libgladeui-1.0/gladeui/glade-text-button.h
> include/libgladeui-1.0/gladeui/glade-tool-button-editor.h
> include/libgladeui-1.0/gladeui/glade-tool-item-group-editor.h
>@@ -52,16 +53,16 @@ include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
> include/libgladeui-1.0/gladeui/glade-widget.h
> include/libgladeui-1.0/gladeui/glade-xml-utils.h
> include/libgladeui-1.0/gladeui/glade.h
>-%%GNOME:%%lib/glade3/modules/libgladegnome.la
>-%%GNOME:%%lib/glade3/modules/libgladegnome.so
>-%%PYTHON:%%lib/glade3/modules/libgladepython.la
>-%%PYTHON:%%lib/glade3/modules/libgladepython.so
>+%%GNOME%%lib/glade3/modules/libgladegnome.la
>+%%GNOME%%lib/glade3/modules/libgladegnome.so
>+%%PYTHON%%lib/glade3/modules/libgladepython.la
>+%%PYTHON%%lib/glade3/modules/libgladepython.so
> lib/glade3/modules/libgladegtk.la
> lib/glade3/modules/libgladegtk.so
> lib/libgladeui-1.la
> lib/libgladeui-1.so
> lib/libgladeui-1.so.11
>-lib/libgladeui-1.so.11.1.2
>+lib/libgladeui-1.so.11.2.0
> libdata/pkgconfig/gladeui-1.0.pc
> share/applications/glade-3.desktop
> %%DOCSDIR%%/GladeApp.html
>@@ -103,13 +104,13 @@ share/applications/glade-3.desktop
> %%DOCSDIR%%/style.css
> %%DOCSDIR%%/up.png
> %%DOCSDIR%%/widgetclasses.html
>-%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml
>-%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in
>-%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml
>-%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml.in
>+%%GNOME%%%%DATADIR%%/catalogs/bonobo.xml
>+%%GNOME%%%%DATADIR%%/catalogs/bonobo.xml.in
>+%%GNOME%%%%DATADIR%%/catalogs/canvas.xml
>+%%GNOME%%%%DATADIR%%/catalogs/canvas.xml.in
> %%DATADIR%%/catalogs/glade-catalog.dtd
>-%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml
>-%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml.in
>+%%GNOME%%%%DATADIR%%/catalogs/gnome.xml
>+%%GNOME%%%%DATADIR%%/catalogs/gnome.xml.in
> %%DATADIR%%/catalogs/gtk+.xml
> %%DATADIR%%/catalogs/gtk+.xml.in
> %%DATADIR%%/catalogs/gtkunixprint.xml
>@@ -117,29 +118,29 @@ share/applications/glade-3.desktop
> %%DATADIR%%/pixmaps/atk.png
> %%DATADIR%%/pixmaps/devhelp.png
> %%DATADIR%%/pixmaps/drag-resize.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
>@@ -169,6 +170,7 @@ share/applications/glade-3.desktop
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combo.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxentry.png
>+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxtext.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-curve.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-custom.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
>@@ -266,29 +268,29 @@ share/applications/glade-3.desktop
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
> %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
>-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
>+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
>@@ -318,6 +320,7 @@ share/applications/glade-3.desktop
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combo.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxentry.png
>+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxtext.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-curve.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-custom.png
> %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
>@@ -565,3 +568,4 @@ share/omf/glade3/glade3-sl.omf
> share/omf/glade3/glade3-sv.omf
> share/omf/glade3/glade3-uk.omf
> share/omf/glade3/glade3-zh_CN.omf
>+@dir lib/glade3/bindings

Actions: View | Diff

Attachments on bug 196404: 151158 | 151159