summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-06-18 23:29:41 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-06-18 23:29:41 +0800
commite5501f28dc2aebe5c724663f3ba5fa23d40ea338 (patch)
treee4dea14f13807697646b3638f338802f990ae59a
parentbade5b9ed413eabb65142e96abce15fad0f882f0 (diff)
downloadmarcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.tar
marcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.tar.gz
marcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.tar.bz2
marcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.tar.lz
marcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.tar.xz
marcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.tar.zst
marcuscom-ports-e5501f28dc2aebe5c724663f3ba5fa23d40ea338.zip
My replacing got a bit too greedy. Remove some hunks that break compilation.
Reported by: Yasuda Keisuke <kysd@po.harenet.ne.jp> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9031 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gtk20/Makefile4
-rw-r--r--x11-toolkits/gtk20/files/patch-svn27
2 files changed, 2 insertions, 29 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b261316d8..5797d15ea 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.110 2007/06/17 05:17:04 marcus Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.111 2007/06/17 20:24:56 marcus Exp $
#
PORTNAME= gtk
PORTVERSION= 2.11.3
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/v2.10/ \
diff --git a/x11-toolkits/gtk20/files/patch-svn b/x11-toolkits/gtk20/files/patch-svn
index e243590b4..769b238e6 100644
--- a/x11-toolkits/gtk20/files/patch-svn
+++ b/x11-toolkits/gtk20/files/patch-svn
@@ -28,33 +28,6 @@
}
typedef struct
-@@ -261,7 +261,7 @@ gtk_builder_get_parameters (GtkBuilder
- if (!pspec)
- {
- g_warning ("Unknown property: %s.%s\n",
-- g_typename (object_type), prop->name);
-+ g_type_name (object_type), prop->name);
- continue;
- }
-
-@@ -303,7 +303,7 @@ gtk_builder_get_parameters (GtkBuilder
- else if (!gtk_builder_value_from_string (pspec, prop->data, &parameter.value))
- {
- g_warning ("failed to set property %s.%s to %s",
-- g_typename (object_type), prop->name, prop->data);
-+ g_type_name (object_type), prop->name, prop->data);
- continue;
- }
-
-@@ -537,7 +537,7 @@ apply_delayed_properties (const gchar *w
- pspec = g_object_class_find_property (G_OBJECT_CLASS (oclass),
- property->name);
- if (!pspec)
-- g_warning ("Unknown property: %s.%s\n", g_typename (object_type),
-+ g_warning ("Unknown property: %s.%s\n", g_type_name (object_type),
- property->name);
- else
- {
@@ -1238,23 +1238,23 @@ _gtk_builder_flags_from_string (GType ty
/**
* gtk_builder_get_type_from_name: