summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-08-30 04:02:11 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-08-30 04:02:11 +0800
commit0538ebf62146925570333a1cbe51202a9b1bb094 (patch)
tree1d081b852588e314a6c35646a0d8c9c9f28e3e89
parent2f83c5590d0e8d54a6a82ff5b86497605e20b915 (diff)
downloadmarcuscom-ports-0538ebf62146925570333a1cbe51202a9b1bb094.tar.gz
marcuscom-ports-0538ebf62146925570333a1cbe51202a9b1bb094.tar.zst
marcuscom-ports-0538ebf62146925570333a1cbe51202a9b1bb094.zip
Update to 2.8.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4662 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gtk20/Makefile5
-rw-r--r--x11-toolkits/gtk20/distinfo4
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c59
3 files changed, 4 insertions, 64 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 003bc771b..6abccb38c 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,11 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.68 2005/08/24 19:36:46 mezz Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.69 2005/08/25 16:28:44 marcus Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.8.2
-PORTREVISION= 1
+PORTVERSION= 2.8.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
ftp://ftp.gtk.org/pub/gtk/v2.8/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 650985a9e..2eccc7898 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtk+-2.8.2.tar.bz2) = 5b8b6d24f9f24469f96934b6efcc34b9
-SIZE (gnome2/gtk+-2.8.2.tar.bz2) = 11802646
+MD5 (gnome2/gtk+-2.8.3.tar.bz2) = 1e7a49eaf078af8aeb84369a5fefa8c0
+SIZE (gnome2/gtk+-2.8.3.tar.bz2) = 11765089
diff --git a/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c b/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c
deleted file mode 100644
index 7ba977a67..000000000
--- a/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- gdk/gdkscreen.c.orig Tue Aug 23 23:29:05 2005
-+++ gdk/gdkscreen.c Thu Aug 25 13:18:01 2005
-@@ -29,7 +29,7 @@
- #include "gdkalias.h"
-
- static void gdk_screen_class_init (GdkScreenClass *klass);
--static void gdk_screen_init (GdkScreen *screen);
-+static void gdk_screen_init_instance (GTypeInstance *instance, gpointer g_class);
- static void gdk_screen_dispose (GObject *object);
- static void gdk_screen_finalize (GObject *object);
-
-@@ -53,14 +53,14 @@ gdk_screen_get_type (void)
- static const GTypeInfo object_info =
- {
- sizeof (GdkScreenClass),
-- (GBaseInitFunc) gdk_screen_init,
-+ (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gdk_screen_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GdkScreen),
- 0, /* n_preallocs */
-- (GInstanceInitFunc) NULL,
-+ (GInstanceInitFunc) gdk_screen_init_instance,
- };
-
- object_type = g_type_register_static (G_TYPE_OBJECT,
-@@ -101,9 +101,10 @@ gdk_screen_class_init (GdkScreenClass *k
- }
-
- static void
--gdk_screen_init (GdkScreen *screen)
-+gdk_screen_init_instance (GTypeInstance *instance,
-+ gpointer g_class)
- {
-- screen->resolution = -1;
-+ GDK_SCREEN (instance)->resolution = -1.;
- }
-
- static void
-@@ -407,7 +408,7 @@ gdk_screen_set_resolution_libgtk_only (G
- if (dpi >= 0)
- screen->resolution = dpi;
- else
-- screen->resolution = -1;
-+ screen->resolution = -1.;
- }
-
- /**
-@@ -423,7 +424,7 @@ gdk_screen_set_resolution_libgtk_only (G
- gdouble
- gdk_screen_get_resolution_libgtk_only (GdkScreen *screen)
- {
-- g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
-+ g_return_val_if_fail (GDK_IS_SCREEN (screen), -1.);
-
- return screen->resolution;
- }