Attachment #50337 for bug #76718

View | Details | Raw Unified | Return to bug 76718
Collapse All | Expand All




#

PORTNAME=	gtk-qt-engine
PORTVERSION=	0.6
PORTREVISION=	2
CATEGORIES=	x11-themes
MASTER_SITES=	http://www.freedesktop.org/~davidsansome/


		${WRKSRC}/kcm_gtk/Makefile

post-install:
	@# Remove Debian stuff we didn't want in the first place
	@${RM} /tmp/menu/kcmgtk.menu
	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
	@# We do want this archive!
	@${INSTALL_DATA} ${WRKSRC}/kcm_gtk/kcm_kcmgtk.la ${LOCALBASE}/lib/kde3/
	@${ECHO}
	@${ECHO} "Use \"GTK styles and fonts\" from the KDE control center to set or"

Lines 1-2 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine.new/distinfo (-2 / +2 lines)
1	MD5 (gtk-qt-engine-0.5.tar.bz2) = c1952ac83bccb6a07fc16afd02718499	1	MD5 (gtk-qt-engine-0.6.tar.bz2) = 9c02c95a6e8d304b1f2801429759e1c0
2	SIZE (gtk-qt-engine-0.5.tar.bz2) = 476677	2	SIZE (gtk-qt-engine-0.6.tar.bz2) = 435510

Lines 1-10 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine.new/files/patch-qt_qt_wrapper.cpp (-10 lines)
1	--- src/qt_qt_wrapper.cpp.orig Sun Nov 7 14:47:15 2004
2	+++ src/qt_qt_wrapper.cpp Sun Nov 7 14:47:30 2004
3	@@ -5,7 +5,6 @@
4	#include <qimage.h>
5	#include <qstylefactory.h>
6	#include <kapplication.h>
7	-#include <kcmdlineargs.h>
8	#include <qtabbar.h>
9	#include <qcheckbox.h>
10	#include <qradiobutton.h>




--- src/qt_theme_draw.c.orig	Sun Nov  7 13:41:29 2004
+++ src/qt_theme_draw.c	Sun Nov  7 13:55:19 2004
@@ -625,17 +625,18 @@
 	if (DETAIL("tooltip"))
 	{
 		GdkColor tooltipColor;
+		GdkGC* tooltipGc;
+                GdkGCValues gc_values;
+                GdkGCValuesMask gc_values_mask;
 		tooltipColor.red = 255*257;
 		tooltipColor.green = 255*257;
 		tooltipColor.blue = 220*257;
 		gdk_colormap_alloc_color(style->colormap, &tooltipColor, FALSE, TRUE);
 		
-		GdkGCValues gc_values;
-		GdkGCValuesMask gc_values_mask;
 		gc_values_mask = GDK_GC_FOREGROUND;
 		gc_values.foreground = tooltipColor;
 		
-		GdkGC* tooltipGc = (GdkGC*) gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+		tooltipGc = (GdkGC*) gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
 		gdk_draw_rectangle(window, tooltipGc, TRUE, x, y, width, height);
 		gdk_draw_rectangle(window, style->black_gc, FALSE, x, y, width - 1, height - 1);
 		

Return to bug 76718

Lines 6-13 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine.new/Makefile (-4 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gtk-qt-engine	8	PORTNAME= gtk-qt-engine
9	PORTVERSION= 0.5	9	PORTVERSION= 0.6
10	PORTREVISION= 2
11	CATEGORIES= x11-themes	10	CATEGORIES= x11-themes
12	MASTER_SITES= http://www.freedesktop.org/~davidsansome/	11	MASTER_SITES= http://www.freedesktop.org/~davidsansome/
13		12
Lines 41-50 Link Here
41	${WRKSRC}/kcm_gtk/Makefile	40	${WRKSRC}/kcm_gtk/Makefile
42		41
43	post-install:	42	post-install:
44	@# Remove Debian stuff we didn't want in the first place
45	@${RM} /tmp/menu/kcmgtk.menu	43	@${RM} /tmp/menu/kcmgtk.menu
46	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi	44	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
47	@# We do want this archive!
48	@${INSTALL_DATA} ${WRKSRC}/kcm_gtk/kcm_kcmgtk.la ${LOCALBASE}/lib/kde3/	45	@${INSTALL_DATA} ${WRKSRC}/kcm_gtk/kcm_kcmgtk.la ${LOCALBASE}/lib/kde3/
49	@${ECHO}	46	@${ECHO}
50	@${ECHO} "Use \"GTK styles and fonts\" from the KDE control center to set or"	47	@${ECHO} "Use \"GTK styles and fonts\" from the KDE control center to set or"

Lines 1-24 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine.new/files/patch-qt_theme_draw.c (-24 lines)
1	--- src/qt_theme_draw.c.orig Sun Nov 7 13:41:29 2004
2	+++ src/qt_theme_draw.c Sun Nov 7 13:55:19 2004
3	@@ -625,17 +625,18 @@
4	if (DETAIL("tooltip"))
5	{
6	GdkColor tooltipColor;
7	+ GdkGC* tooltipGc;
8	+ GdkGCValues gc_values;
9	+ GdkGCValuesMask gc_values_mask;
10	tooltipColor.red = 255*257;
11	tooltipColor.green = 255*257;
12	tooltipColor.blue = 220*257;
13	gdk_colormap_alloc_color(style->colormap, &tooltipColor, FALSE, TRUE);
14
15	- GdkGCValues gc_values;
16	- GdkGCValuesMask gc_values_mask;
17	gc_values_mask = GDK_GC_FOREGROUND;
18	gc_values.foreground = tooltipColor;
19
20	- GdkGC* tooltipGc = (GdkGC*) gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
21	+ tooltipGc = (GdkGC*) gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
22	gdk_draw_rectangle(window, tooltipGc, TRUE, x, y, width, height);
23	gdk_draw_rectangle(window, style->black_gc, FALSE, x, y, width - 1, height - 1);
24