Attachment 68799 Details for Bug 101030 – x11-themes::gtk-qt-engine.diff

[patch] x11-themes::gtk-qt-engine.diff

x11-themes::gtk-qt-engine.diff (text/plain), 4.33 KB, created by Danny Pansters on 2006-07-29 20:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danny Pansters

Created: 2006-07-29 20:40:11 UTC

Size: 4.33 KB

patch

obsolete

>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 <bsd.port.mk>
>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

Actions: View | Diff

Attachments on bug 101030: 68799