Date: Mon, 1 May 2006 16:09:05 -0400 From: "Anish Mistry" <amistry@am-productions.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/96626: Update x11-themes/gtk-smooth-engine to 0.6.0.1 Message-ID: <1146514145.49789@bigguy.am-productions.biz> Resent-Message-ID: <200605012010.k41KA9Ac086458@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96626
>Category: ports
>Synopsis: Update x11-themes/gtk-smooth-engine to 0.6.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon May 01 20:10:06 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Anish Mistry
>Release: FreeBSD 6.1-RC i386
>Organization:
AM Productions
>Environment:
System: FreeBSD 6.1-RC #0: Tue Apr 18 17:58:27 EDT 2006
amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY
>Description:
Update to latest version, fix CONFLICTS, properly use PLIST_SUB.
>How-To-Repeat:
>Fix:
--- gtk-smooth-engine-0.6.0.1.patch begins here ---
diff -ruN gtk-smooth-engine.orig/Makefile gtk-smooth-engine/Makefile
--- gtk-smooth-engine.orig/Makefile Mon May 1 15:41:22 2006
+++ gtk-smooth-engine/Makefile Mon May 1 16:01:19 2006
@@ -6,8 +6,7 @@
#
PORTNAME= gtk-smooth-engine
-PORTVERSION= 0.5.8
-PORTREVISION= 4
+PORTVERSION= 0.6.0.1
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= smooth-engine
@@ -18,10 +17,11 @@
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
+PLIST_SUB= GTK_VERSION="2.4.0"
WANT_GNOME= yes
CONFIGURE_ENV= X11BASE="${X11BASE}"
-CONFLICTS= gnome-themes-[0-9]*
+CONFLICTS= gtk-engines2-[0-9]*
.include <bsd.port.pre.mk>
diff -ruN gtk-smooth-engine.orig/distinfo gtk-smooth-engine/distinfo
--- gtk-smooth-engine.orig/distinfo Mon May 1 15:41:22 2006
+++ gtk-smooth-engine/distinfo Mon May 1 15:42:31 2006
@@ -1,3 +1,3 @@
-MD5 (gtk-smooth-engine-0.5.8.tar.gz) = 7b4aebf85040b357124de926807dc22a
-SHA256 (gtk-smooth-engine-0.5.8.tar.gz) = cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
-SIZE (gtk-smooth-engine-0.5.8.tar.gz) = 365680
+MD5 (gtk-smooth-engine-0.6.0.1.tar.gz) = a2231118c8187649d1e634fdfe6f36de
+SHA256 (gtk-smooth-engine-0.6.0.1.tar.gz) = 12bb1d1138cbbe9eedb847b5f5f258c2540efe2f65f5aafe822f18684f1b18d1
+SIZE (gtk-smooth-engine-0.6.0.1.tar.gz) = 466428
diff -ruN gtk-smooth-engine.orig/files/patch-gtk1_gtk1_patches.c gtk-smooth-engine/files/patch-gtk1_gtk1_patches.c
--- gtk-smooth-engine.orig/files/patch-gtk1_gtk1_patches.c Mon May 1 15:41:22 2006
+++ gtk-smooth-engine/files/patch-gtk1_gtk1_patches.c Mon May 1 15:50:04 2006
@@ -1,6 +1,6 @@
---- gtk1/gtk1_patches.c.orig Sun Oct 17 02:18:35 2004
-+++ gtk1/gtk1_patches.c Sun Oct 17 02:21:21 2004
-@@ -934,6 +934,8 @@
+--- engines/gtk1/src/smooth_gtk1_patches.c.orig Mon Jan 17 15:03:36 2005
++++ engines/gtk1/src/smooth_gtk1_patches.c Mon May 1 15:48:50 2006
+@@ -959,6 +959,8 @@
slider_length = SCALE_SLIDER_LENGTH(widget->style);
}
@@ -9,17 +9,15 @@
_scale_calc_request (widget, slider_width, slider_length, stepper_size, trough_border, stepper_spacing, &range_rect);
requisition->width = MAX(requisition->width, range_rect.width);
-@@ -1214,7 +1216,8 @@
+@@ -1237,6 +1239,7 @@
+ {
GtkRange *range;
- gint slider_width, slider_length, stepper_size, trough_border, stepper_spacing;
- GdkRectangle range_rect;
--
+ gint slider_width = 15, slider_length = 30, stepper_size = 15, trough_border = 2, stepper_spacing = 2;
+ int size1, size2;
-+
+
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLBAR (widget));
- g_return_if_fail (requisition != NULL);
-@@ -1229,8 +1232,8 @@
+@@ -1252,8 +1255,8 @@
slider_length = SCROLLBAR_MIN_SLIDER_LENGTH(widget->style);
}
diff -ruN gtk-smooth-engine.orig/pkg-plist gtk-smooth-engine/pkg-plist
--- gtk-smooth-engine.orig/pkg-plist Mon May 1 15:41:22 2006
+++ gtk-smooth-engine/pkg-plist Mon May 1 15:55:32 2006
@@ -1,4 +1,4 @@
%%GTK1:%%lib/gtk/themes/engines/libsmooth.la
%%GTK1:%%lib/gtk/themes/engines/libsmooth.so
-%%GTK2:%%lib/gtk-2.0/2.4.0/engines/libsmooth.la
-%%GTK2:%%lib/gtk-2.0/2.4.0/engines/libsmooth.so
+%%GTK2:%%lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.la
+%%GTK2:%%lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
--- gtk-smooth-engine-0.6.0.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1146514145.49789>