Date: Thu, 16 Sep 2004 22:48:03 +0200 From: Danny Pansters <danny@ricin.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/71802: [UPDATE/PATCH, replaces ports/70387] x11-themes/gtk-qt-engine: update to 0.5 Message-ID: <20040916204929.3192943D4C@mx1.FreeBSD.org> Resent-Message-ID: <200409162050.i8GKoJZm061296@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 71802 >Category: ports >Synopsis: [UPDATE/PATCH, replaces ports/70387] x11-themes/gtk-qt-engine: update to 0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Sep 16 20:50:19 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Danny Pansters >Release: FreeBSD 5.3-BETA3 i386 >Organization: >Environment: System: FreeBSD workstation.homenet 5.3-BETA3 FreeBSD 5.3-BETA3 #1: Thu Sep 16 15:41:23 CEST 2004 >Description: - Update to 0.5 - Tested with KDE-3.3 and GTK-2.4.9 - The kcmgtk module for KDE control center now works correctly - Widgets have also improved - Will probably not compile on FreeBSD-4.X, I suggest trying your luck with the removed patch-qt_theme_draw.c from portversion 0.3 in that case Please note: this PR should close the suspended ports/70387 Removed file(s): - files/patch-configure - files/patch-makefile.in - files/patch-qt_theme_draw.c - files/pkg-message.in Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- gtk-qt-engine-0.5.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/Makefile /usr/ports/x11-themes/gtk-qt-engine/Makefile --- /usr/ports/x11-themes/gtk-qt-engine.old/Makefile Wed Jun 2 07:48:40 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/Makefile Thu Sep 16 22:22:34 2004 @@ -6,35 +6,45 @@ # PORTNAME= gtk-qt-engine -PORTVERSION= 0.3 +PORTVERSION= 0.5 CATEGORIES= x11-themes MASTER_SITES= http://www.freedesktop.org/Software/gtk-qt/ MAINTAINER= ports@FreeBSD.org -COMMENT= The GTK-QT Theme Engine allows GTK2 to use QT widget styles +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= 13 +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 - -PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB+= LOCALB=../local pre-configure: - @${RM} -f ${WRKSRC}/config.cache - @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/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: - @${ECHO_MSG} - @${SED} -e "s:/usr/X11R6:${PREFIX}:" ${FILESDIR}/pkg-message.in \ - > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + @# 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> diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/distinfo /usr/ports/x11-themes/gtk-qt-engine/distinfo --- /usr/ports/x11-themes/gtk-qt-engine.old/distinfo Mon May 31 00:17:04 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/distinfo Sat Sep 11 17:27:05 2004 @@ -1,2 +1,2 @@ -MD5 (gtk-qt-engine-0.3.tar.bz2) = 0685783bec472b682366f213134a6b3c -SIZE (gtk-qt-engine-0.3.tar.bz2) = 170845 +MD5 (gtk-qt-engine-0.5.tar.bz2) = c1952ac83bccb6a07fc16afd02718499 +SIZE (gtk-qt-engine-0.5.tar.bz2) = 476677 diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/files/patch-configure /usr/ports/x11-themes/gtk-qt-engine/files/patch-configure --- /usr/ports/x11-themes/gtk-qt-engine.old/files/patch-configure Mon May 31 00:17:04 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/files/patch-configure Thu Jan 1 01:00:00 1970 @@ -1,32 +0,0 @@ ---- 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 - diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/files/patch-makefile.in /usr/ports/x11-themes/gtk-qt-engine/files/patch-makefile.in --- /usr/ports/x11-themes/gtk-qt-engine.old/files/patch-makefile.in Mon May 31 00:17:04 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/files/patch-makefile.in Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Feb 23 16:14:53 2004 -+++ Makefile.in Mon Feb 23 16:35:40 2004 -@@ -83,7 +83,7 @@ - - SUBDIRS = Theme - --QTDIR = /usr/lib/qt3 -+QTDIR = $(PREFIX) - - INCLUDES = $(QTENGINE_CFLAGS) -I$(QTDIR)/include/ - diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/files/patch-qt_theme_draw.c /usr/ports/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c --- /usr/ports/x11-themes/gtk-qt-engine.old/files/patch-qt_theme_draw.c Mon May 31 03:45:33 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c Thu Jan 1 01:00:00 1970 @@ -1,78 +0,0 @@ ---- 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); diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/files/pkg-message.in /usr/ports/x11-themes/gtk-qt-engine/files/pkg-message.in --- /usr/ports/x11-themes/gtk-qt-engine.old/files/pkg-message.in Mon May 31 00:17:04 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/files/pkg-message.in Thu Jan 1 01:00:00 1970 @@ -1,7 +0,0 @@ -===================================================== -NOTE: Add the following line to your ~/.gtkrc-2.0 : - -include "/usr/X11R6/share/themes/Qt/gtk-2.0/gtkrc" - -More info: http://www.freedesktop.org/Software/gtk-qt -===================================================== diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/pkg-descr /usr/ports/x11-themes/gtk-qt-engine/pkg-descr --- /usr/ports/x11-themes/gtk-qt-engine.old/pkg-descr Mon May 31 00:17:04 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/pkg-descr Thu Sep 16 21:57:56 2004 @@ -1,5 +1,7 @@ -The GTK-QT Theme Engine allows GTK2 to use QT widget styles. +GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes +so that they fit in more nicely with KDE. Includes a KDE +control center module for GTK theme selection. WWW: http://www.freedesktop.org/Software/gtk-qt -David Sansome <me@davidsansome.com> +Author: David Sansome <me@davidsansome.com> diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-qt-engine.old/pkg-plist /usr/ports/x11-themes/gtk-qt-engine/pkg-plist --- /usr/ports/x11-themes/gtk-qt-engine.old/pkg-plist Mon May 31 00:17:04 2004 +++ /usr/ports/x11-themes/gtk-qt-engine/pkg-plist Thu Sep 16 19:43:41 2004 @@ -1,7 +1,9 @@ +lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so -libdata/pkgconfig/gtk-qt-engine-2.pc -share/themes/Qt/ICON.png -share/themes/Qt/README.html share/themes/Qt/gtk-2.0/gtkrc +%%LOCALB%%/lib/kde3/kcm_kcmgtk.la +%%LOCALB%%/lib/kde3/kcm_kcmgtk.so +%%LOCALB%%/share/applnk/Settings/LookNFeel/kcmgtk.desktop +%%LOCALB%%/share/applications/kde/kcmgtk-xdg.desktop @dirrm share/themes/Qt/gtk-2.0 @dirrm share/themes/Qt --- gtk-qt-engine-0.5.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?20040916204929.3192943D4C>