Attachment #46821 for bug #71802

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




#

PORTNAME=	gtk-qt-engine
PORTVERSION=	0.5
CATEGORIES=	x11-themes
MASTER_SITES=	http://www.freedesktop.org/Software/gtk-qt/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes

USE_BZIP2=	yes
USE_X_PREFIX=	yes
USE_GMAKE=	yes
USE_LIBTOOL_VER=	15
WANT_GNOME=	no
USE_GNOME=	gnomehack gtk20
USE_QT_VER=	3
USE_REINPLACE=	yes

PLIST_SUB=	GTK_VER=2.4.0
PLIST_SUB+=	LOCALB=../local
PKGMESSAGE=	${WRKDIR}/pkg-message

pre-configure:
	@${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \
		${WRKSRC}/kcm_gtk/kcmgtk.cpp

post-configure:
	@${REINPLACE_CMD} -e "s|/usr/lib/menu|/tmp/menu|" \
		${WRKSRC}/kcm_gtk/Makefile
	@${REINPLACE_CMD} -e \
		"s|/usr/share/applications|${LOCALBASE}/share/applications/kde|" \
		${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"
	@${ECHO} "change the GTK style. NOTE: this will overwrite your ~/.gtkrc-2.0."
	@${ECHO}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/distinfo (-2 / +2 lines)
1	MD5 (gtk-qt-engine-0.3.tar.bz2) = 0685783bec472b682366f213134a6b3c	1	MD5 (gtk-qt-engine-0.5.tar.bz2) = c1952ac83bccb6a07fc16afd02718499
2	SIZE (gtk-qt-engine-0.3.tar.bz2) = 170845	2	SIZE (gtk-qt-engine-0.5.tar.bz2) = 476677




--- configure.orig	Sun May 30 23:55:02 2004
+++ configure	Sun May 30 23:57:33 2004
@@ -5733,12 +5733,15 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-# Prevent multiple expansion
+# We have pkg-config in /usr/local, while gtk stuff is /usr/X11R6
+PKG_CONFIG=%%LOCALBASE%%/bin/pkg-config
 
+# Prevent multiple expansion
 
 
 
@@ -5790,7 +5793,11 @@
      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+     # This seems to just decide that 0.9.0 > 0.15.0 which is not helpful
+     #if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+     VER=`$PKG_CONFIG --version | sed s/"\."//g`
+     MINVER=090
+     if [ $VER -ge $MINVER ]; then
         echo $ac_n "checking for gtk+-2.0 >= 2.0.0""... $ac_c" 1>&6
 echo "configure:5796: checking for gtk+-2.0 >= 2.0.0" >&5
 

Lines 1-11 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/files/patch-makefile.in (-11 lines)
1	--- Makefile.in.orig Mon Feb 23 16:14:53 2004
2	+++ Makefile.in Mon Feb 23 16:35:40 2004
3	@@ -83,7 +83,7 @@
4
5	SUBDIRS = Theme
6
7	-QTDIR = /usr/lib/qt3
8	+QTDIR = $(PREFIX)
9
10	INCLUDES = $(QTENGINE_CFLAGS) -I$(QTDIR)/include/
11




--- qt_theme_draw.c.orig	Mon May 31 01:16:28 2004
+++ qt_theme_draw.c	Mon May 31 03:19:50 2004
@@ -257,6 +256,9 @@
 	    gint          height)
 {
 
+GdkGC *gc1 = NULL;
+GdkGC *gc2 = NULL;
+
 if (!widget) return;
 
   sanitize_size(window, &width, &height);
@@ -300,8 +302,6 @@
   }
 
   return;
-  GdkGC *gc1 = NULL;
-  GdkGC *gc2 = NULL;
 
   g_return_if_fail(style != NULL);
   g_return_if_fail(window != NULL);
@@ -687,9 +687,6 @@
            GtkArrowType arrow_type,
            gint fill, gint x, gint y, gint width, gint height)
 {
-  if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
-    return;
-  /*printf("Arrow (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
   GdkGC              *gc1;
   GdkGC              *gc2;
   GdkGC              *gc3;
@@ -698,6 +695,10 @@
   gint                half_height;
   gint                ax, ay, aw, ah;
 
+  if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
+    return;
+  /*printf("Arrow (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+
   g_return_if_fail(style != NULL);
   g_return_if_fail(window != NULL);
 
@@ -1095,7 +1096,10 @@
 	gint y,
 	gint width,
 	gint height)
-{
+{	
+	GdkGC *light_gc, *dark_gc;
+	GtkOrientation      orientation;
+
 	sanitize_size(window, &width, &height);
 	/*printf("Box (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
 	if (WIDGET("GtkHScrollbar") || WIDGET("GtkVScrollbar"))
@@ -1136,9 +1140,6 @@
 	
 	/*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
 	
-	GdkGC *light_gc, *dark_gc;
-	GtkOrientation      orientation;
-	
 	g_return_if_fail(style != NULL);
 	g_return_if_fail(window != NULL);
 	
@@ -1716,12 +1717,12 @@
             gint height,
             GtkOrientation orientation)
 {
-  return;
   GdkPoint pointsh[7];
   GdkRegion *clipreg;
   GdkRectangle rec;
   int i, rect = FALSE, midlines = MARKS_SLASH;
   int modx, mody;
+  return;
 
 
   g_return_if_fail(style != NULL);

Lines 1-7 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/files/pkg-message.in (-7 lines)
1	=====================================================
2	NOTE: Add the following line to your ~/.gtkrc-2.0 :
3
4	include "/usr/X11R6/share/themes/Qt/gtk-2.0/gtkrc"
5
6	More info: http://www.freedesktop.org/Software/gtk-qt
7	=====================================================

Lines 1-5 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/pkg-descr (-2 / +4 lines)
1	The GTK-QT Theme Engine allows GTK2 to use QT widget styles.	1	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
		2	so that they fit in more nicely with KDE. Includes a KDE
		3	control center module for GTK theme selection.
2		4
3	WWW: http://www.freedesktop.org/Software/gtk-qt	5	WWW: http://www.freedesktop.org/Software/gtk-qt
4		6
5	David Sansome <me@davidsansome.com>	7	Author: David Sansome <me@davidsansome.com>

Lines 1-7 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/pkg-plist (-3 / +5 lines)
		1	lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
1	lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so	2	lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
2	libdata/pkgconfig/gtk-qt-engine-2.pc
3	share/themes/Qt/ICON.png
4	share/themes/Qt/README.html
5	share/themes/Qt/gtk-2.0/gtkrc	3	share/themes/Qt/gtk-2.0/gtkrc
		4	%%LOCALB%%/lib/kde3/kcm_kcmgtk.la
		5	%%LOCALB%%/lib/kde3/kcm_kcmgtk.so
		6	%%LOCALB%%/share/applnk/Settings/LookNFeel/kcmgtk.desktop
		7	%%LOCALB%%/share/applications/kde/kcmgtk-xdg.desktop
6	@dirrm share/themes/Qt/gtk-2.0	8	@dirrm share/themes/Qt/gtk-2.0
7	@dirrm share/themes/Qt	9	@dirrm share/themes/Qt

Return to bug 71802

Lines 6-40 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/Makefile (-12 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= gtk-qt-engine	8	PORTNAME= gtk-qt-engine
9	PORTVERSION= 0.3	9	PORTVERSION= 0.5
10	CATEGORIES= x11-themes	10	CATEGORIES= x11-themes
11	MASTER_SITES= http://www.freedesktop.org/Software/gtk-qt/	11	MASTER_SITES= http://www.freedesktop.org/Software/gtk-qt/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= The GTK-QT Theme Engine allows GTK2 to use QT widget styles	14	COMMENT= GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
15		15
16	USE_BZIP2= yes	16	USE_BZIP2= yes
17	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
18	USE_GMAKE= yes	18	USE_GMAKE= yes
19	USE_LIBTOOL_VER= 13	19	USE_LIBTOOL_VER= 15
20	WANT_GNOME= no	20	WANT_GNOME= no
21	USE_GNOME= gnomehack gtk20	21	USE_GNOME= gnomehack gtk20
22	USE_QT_VER= 3	22	USE_QT_VER= 3
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
24		24
25	PLIST_SUB= GTK_VER=2.4.0	25	PLIST_SUB= GTK_VER=2.4.0
26		26	PLIST_SUB+= LOCALB=../local
27	PKGMESSAGE= ${WRKDIR}/pkg-message
28		27
29	pre-configure:	28	pre-configure:
30	@${RM} -f ${WRKSRC}/config.cache	29	@${REINPLACE_CMD} -e "s\|/share/themes/\|/X11R6/share/themes/\|" \
31	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|" ${WRKSRC}/configure	30	${WRKSRC}/kcm_gtk/kcmgtk.cpp
		31
		32	post-configure:
		33	@${REINPLACE_CMD} -e "s\|/usr/lib/menu\|/tmp/menu\|" \
		34	${WRKSRC}/kcm_gtk/Makefile
		35	@${REINPLACE_CMD} -e \
		36	"s\|/usr/share/applications\|${LOCALBASE}/share/applications/kde\|" \
		37	${WRKSRC}/kcm_gtk/Makefile
32		38
33	post-install:	39	post-install:
34	@${ECHO_MSG}	40	@# Remove Debian stuff we didn't want in the first place
35	@${SED} -e "s:/usr/X11R6:${PREFIX}:" ${FILESDIR}/pkg-message.in \	41	@${RM} /tmp/menu/kcmgtk.menu
36	> ${PKGMESSAGE}	42	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
37	@${CAT} ${PKGMESSAGE}	43	@# We do want this archive!
38	@${ECHO_MSG}	44	@${INSTALL_DATA} ${WRKSRC}/kcm_gtk/kcm_kcmgtk.la ${LOCALBASE}/lib/kde3/
		45	@${ECHO}
		46	@${ECHO} "Use \"GTK styles and fonts\" from the KDE control center to set or"
		47	@${ECHO} "change the GTK style. NOTE: this will overwrite your ~/.gtkrc-2.0."
		48	@${ECHO}
39		49
40	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/files/patch-configure (-32 lines)
1	--- configure.orig Sun May 30 23:55:02 2004
2	+++ configure Sun May 30 23:57:33 2004
3	@@ -5733,12 +5733,15 @@
4
5	# This can be used to rebuild libtool when needed
6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
8
9	# Always use our own libtool.
10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11
12	-# Prevent multiple expansion
13	+# We have pkg-config in /usr/local, while gtk stuff is /usr/X11R6
14	+PKG_CONFIG=%%LOCALBASE%%/bin/pkg-config
15
16	+# Prevent multiple expansion
17
18
19
20	@@ -5790,7 +5793,11 @@
21	echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
22	else
23	PKG_CONFIG_MIN_VERSION=0.9.0
24	- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
25	+ # This seems to just decide that 0.9.0 > 0.15.0 which is not helpful
26	+ #if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
27	+ VER=`$PKG_CONFIG --version \| sed s/"\."//g`
28	+ MINVER=090
29	+ if [ $VER -ge $MINVER ]; then
30	echo $ac_n "checking for gtk+-2.0 >= 2.0.0""... $ac_c" 1>&6
31	echo "configure:5796: checking for gtk+-2.0 >= 2.0.0" >&5
32

Lines 1-78 Link Here

(-)/usr/ports/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c (-78 lines)
1	--- qt_theme_draw.c.orig Mon May 31 01:16:28 2004
2	+++ qt_theme_draw.c Mon May 31 03:19:50 2004
3	@@ -257,6 +256,9 @@
4	gint height)
5	{
6
7	+GdkGC *gc1 = NULL;
8	+GdkGC *gc2 = NULL;
9	+
10	if (!widget) return;
11
12	sanitize_size(window, &width, &height);
13	@@ -300,8 +302,6 @@
14	}
15
16	return;
17	- GdkGC *gc1 = NULL;
18	- GdkGC *gc2 = NULL;
19
20	g_return_if_fail(style != NULL);
21	g_return_if_fail(window != NULL);
22	@@ -687,9 +687,6 @@
23	GtkArrowType arrow_type,
24	gint fill, gint x, gint y, gint width, gint height)
25	{
26	- if (DETAIL("hscrollbar") \|\| DETAIL("vscrollbar"))
27	- return;
28	- /printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);/
29	GdkGC *gc1;
30	GdkGC *gc2;
31	GdkGC *gc3;
32	@@ -698,6 +695,10 @@
33	gint half_height;
34	gint ax, ay, aw, ah;
35
36	+ if (DETAIL("hscrollbar") \|\| DETAIL("vscrollbar"))
37	+ return;
38	+ /printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);/
39	+
40	g_return_if_fail(style != NULL);
41	g_return_if_fail(window != NULL);
42
43	@@ -1095,7 +1096,10 @@
44	gint y,
45	gint width,
46	gint height)
47	-{
48	+{
49	+ GdkGC light_gc, dark_gc;
50	+ GtkOrientation orientation;
51	+
52	sanitize_size(window, &width, &height);
53	/printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);/
54	if (WIDGET("GtkHScrollbar") \|\| WIDGET("GtkVScrollbar"))
55	@@ -1136,9 +1140,6 @@
56
57	/printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);/
58
59	- GdkGC light_gc, dark_gc;
60	- GtkOrientation orientation;
61	-
62	g_return_if_fail(style != NULL);
63	g_return_if_fail(window != NULL);
64
65	@@ -1716,12 +1717,12 @@
66	gint height,
67	GtkOrientation orientation)
68	{
69	- return;
70	GdkPoint pointsh[7];
71	GdkRegion *clipreg;
72	GdkRectangle rec;
73	int i, rect = FALSE, midlines = MARKS_SLASH;
74	int modx, mody;
75	+ return;
76
77
78	g_return_if_fail(style != NULL);