From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 29 19:40:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EF5216A5B1 for ; Sat, 29 Jul 2006 19:40:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11C2A43DB8 for ; Sat, 29 Jul 2006 19:40:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6TJeBh6031469 for ; Sat, 29 Jul 2006 19:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6TJeB6w031468; Sat, 29 Jul 2006 19:40:11 GMT (envelope-from gnats) Resent-Date: Sat, 29 Jul 2006 19:40:11 GMT Resent-Message-Id: <200607291940.k6TJeB6w031468@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Danny Pansters Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6801016A4DE for ; Sat, 29 Jul 2006 19:37:39 +0000 (UTC) (envelope-from danny@ricin.com) Received: from smtpq1.tilbu1.nb.home.nl (smtpq1.tilbu1.nb.home.nl [213.51.146.200]) by mx1.FreeBSD.org (Postfix) with ESMTP id C199543D6D for ; Sat, 29 Jul 2006 19:37:38 +0000 (GMT) (envelope-from danny@ricin.com) Received: from [213.51.146.188] (port=54398 helo=smtp3.tilbu1.nb.home.nl) by smtpq1.tilbu1.nb.home.nl with esmtp (Exim 4.30) id 1G6ucx-0007Ct-T6; Sat, 29 Jul 2006 21:37:35 +0200 Received: from cp464173-a.dbsch1.nb.home.nl ([84.27.221.74]:53825 helo=_HOSTNAME_) by smtp3.tilbu1.nb.home.nl with smtp (Exim 4.30) id 1G6ucx-0007DI-Ny; Sat, 29 Jul 2006 21:37:35 +0200 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Sat, 29 Jul 2006 21:37:29 +0200 Message-Id: <20060729193738.C199543D6D@mx1.FreeBSD.org> Date: Sat, 29 Jul 2006 21:37:29 +0200 From: "Danny Pansters" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: danny@ricin.com Subject: ports/101030: [maintainer] x11-themes/gtk-qt-engine: update to version 0.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Danny Pansters List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 19:40:24 -0000 >Number: 101030 >Category: ports >Synopsis: [maintainer] x11-themes/gtk-qt-engine: update to version 0.7 >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: Sat Jul 29 19:40:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Danny Pansters >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD desktop.homenet 6.1-STABLE FreeBSD 6.1-STABLE #0: Sun Jul 16 20:40:22 CEST 2006 root@desktop.homenet:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Update to version 0.7 - Optionally use libbonoboui (default: on) - MASTER_SITE address changed - Simplify port a bit, localbase/prefix vs x11base REMOVED: obsolete patchfile and files/ directory >How-To-Repeat: >Fix: --- x11-themes::gtk-qt-engine.diff begins here --- diff -ruN x11-themes/gtk-qt-engine.old/Makefile x11-themes/gtk-qt-engine/Makefile --- x11-themes/gtk-qt-engine.old/Makefile Sat Jul 29 18:32:09 2006 +++ x11-themes/gtk-qt-engine/Makefile Sat Jul 29 21:22:44 2006 @@ -6,29 +6,31 @@ # PORTNAME= gtk-qt-engine -PORTVERSION= 0.6 -PORTREVISION= 5 +PORTVERSION= 0.7 CATEGORIES= x11-themes -MASTER_SITES= http://www.freedesktop.org/~davidsansome/ \ +MASTER_SITES= http://people.freedesktop.org/~davidsansome/ \ http://freebsd.ricin.com/ports/distfiles/ MAINTAINER= danny@ricin.com COMMENT= GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes -LIB_DEPENDS= kdecore:${PORTSDIR}/x11/kdelibs3 +LIB_DEPENDS= kdecore:${PORTSDIR}/x11/kdelibs3 \ + bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gtk20 USE_QT_VER= 3 +WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB= GTK_VER=${GTK2_VERSION} -PLIST_SUB+= X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} +PLIST_SUB+= X11BASE=${X11BASE} CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +OPTIONS= BONOBOUI "With libbonoboui (recommended)" on + pre-configure: @${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \ ${WRKSRC}/kcm_gtk/kcmgtk.cpp @@ -37,16 +39,11 @@ @${REINPLACE_CMD} -e "s|/usr/lib/menu|/tmp/menu|" \ ${WRKSRC}/kcm_gtk/Makefile @${REINPLACE_CMD} -e \ - "s|/usr/share/applications|${LOCALBASE}/share/applications/kde|" \ + "s|/usr/share/applications|${PREFIX}/share/applications/kde|g" \ ${WRKSRC}/kcm_gtk/Makefile post-install: @${RM} /tmp/menu/kcmgtk.menu @if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi - @${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 diff -ruN x11-themes/gtk-qt-engine.old/distinfo x11-themes/gtk-qt-engine/distinfo --- x11-themes/gtk-qt-engine.old/distinfo Sat Jul 29 18:32:09 2006 +++ x11-themes/gtk-qt-engine/distinfo Sat Jul 29 18:35:15 2006 @@ -1,3 +1,3 @@ -MD5 (gtk-qt-engine-0.6.tar.bz2) = 9c02c95a6e8d304b1f2801429759e1c0 -SHA256 (gtk-qt-engine-0.6.tar.bz2) = 1e8aa85f03a4c57d28482aea5ce70b458483cc8d15cb36b5f38b499ecb4d0eff -SIZE (gtk-qt-engine-0.6.tar.bz2) = 435510 +MD5 (gtk-qt-engine-0.7.tar.bz2) = 27ca211621f38c45b1c4c9e9ef1f84b0 +SHA256 (gtk-qt-engine-0.7.tar.bz2) = cfaac46c409984afbcf46979f728515535725e8c83bdf70277f23dde068daaee +SIZE (gtk-qt-engine-0.7.tar.bz2) = 439794 diff -ruN x11-themes/gtk-qt-engine.old/files/patch-src__qt_theme_draw.c x11-themes/gtk-qt-engine/files/patch-src__qt_theme_draw.c --- x11-themes/gtk-qt-engine.old/files/patch-src__qt_theme_draw.c Sat Jul 29 18:32:09 2006 +++ x11-themes/gtk-qt-engine/files/patch-src__qt_theme_draw.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- src/qt_theme_draw.c.orig Thu Nov 10 16:23:45 2005 -+++ src/qt_theme_draw.c Thu Nov 10 16:24:55 2005 -@@ -1777,6 +1777,7 @@ - { - pixmap = pix_test; - parent_relative = FALSE; -+ gdk_drawable_set_colormap(pixmap, style->colormap); - } - - gdk_window_set_back_pixmap (window, pixmap, parent_relative); diff -ruN x11-themes/gtk-qt-engine.old/pkg-plist x11-themes/gtk-qt-engine/pkg-plist --- x11-themes/gtk-qt-engine.old/pkg-plist Sat Jul 29 18:32:09 2006 +++ x11-themes/gtk-qt-engine/pkg-plist Sat Jul 29 20:11:28 2006 @@ -1,15 +1,18 @@ -lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a -lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la -lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so -share/gtk-qt-engine/kde-index.theme -share/themes/Qt/gtk-2.0/gtkrc -@cwd %%LOCALBASE%% lib/kde3/kcm_kcmgtk.a lib/kde3/kcm_kcmgtk.la lib/kde3/kcm_kcmgtk.so share/applnk/Settings/LookNFeel/kcmgtk.desktop share/applications/kde/kcmgtk-xdg.desktop +share/locale/de/LC_MESSAGES/gtkqtengine.mo +share/locale/es/LC_MESSAGES/gtkqtengine.mo +share/locale/fr/LC_MESSAGES/gtkqtengine.mo +share/locale/nn/LC_MESSAGES/gtkqtengine.mo @cwd %%X11BASE%% +lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a +lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la +lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so +share/gtk-qt-engine/kde-index.theme +share/themes/Qt/gtk-2.0/gtkrc @dirrm share/themes/Qt/gtk-2.0 @dirrm share/themes/Qt @dirrm share/gtk-qt-engine --- x11-themes::gtk-qt-engine.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: