Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 May 2010 03:12:35 +0400 (MSD)
From:      Yuri Pankov <yuri.pankov@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        makc@FreeBSD.org
Subject:   ports/146851: [PATCH] x11-themes/kde4-style-qtcurve: Allow building of Qt4-only style
Message-ID:  <201005222312.o4MNCZB0003106@darklight.org.ru>
Resent-Message-ID: <201005222320.o4MNK1c0004470@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         146851
>Category:       ports
>Synopsis:       [PATCH] x11-themes/kde4-style-qtcurve: Allow building of Qt4-only style
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 22 23:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Yuri Pankov
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r208414M: Sat May 22 13:53:45 MSD
>Description:
Allow building of Qt4-only style.

Port maintainer (makc@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- kde4-style-qtcurve-1.4.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/qtcurve-kde4/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	22 May 2010 16:17:22 -0000	1.13
+++ Makefile	22 May 2010 23:10:45 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	qtcurve
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://craigd.wikispaces.com/file/view/
 PKGNAMEPREFIX=	kde4-style-
@@ -19,6 +20,20 @@
 USE_CMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib qmake_build uic_build moc_build rcc_build
-USE_KDE4=	kdelibs workspace kdehier kdeprefix automoc4
+USE_KDE=
 
-.include <bsd.port.mk>
+OPTIONS=	KDE4 "Build with KDE4 support (Qt4 only otherwise)" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_KDE4)
+USE_KDE4+=	kdelibs workspace kdehier kdeprefix automoc4
+PLIST_SUB+=	KDE4="" QT4="@comment "
+.else
+CFLAGS+=	-I${LOCALBASE}/include
+CMAKE_ARGS+=	-DQTC_QT_ONLY:BOOL=ON -DQTC_DISABLE_KDEFILEDIALOG_CALLS:BOOL=ON
+QT_COMPONENTS+=	dbus gui imageformats xml
+PLIST_SUB+=	KDE4="@comment " QT4=""
+.endif
+
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-themes/qtcurve-kde4/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist	22 May 2010 16:17:22 -0000	1.8
+++ pkg-plist	22 May 2010 23:10:45 -0000
@@ -1,22 +1,23 @@
-lib/kde4/kstyle_qtcurve_config.so
-lib/kde4/kwin3_qtcurve.so
-lib/kde4/kwin_qtcurve_config.so
-lib/kde4/plugins/styles/qtcurve.so
-share/apps/QtCurve/Agua.qtcurve
-share/apps/QtCurve/Agua_II.qtcurve
-share/apps/QtCurve/Curve.qtcurve
-share/apps/QtCurve/Flat.qtcurve
-share/apps/QtCurve/Human.qtcurve
-share/apps/QtCurve/Inverted.qtcurve
-share/apps/QtCurve/Klearlooks.qtcurve
-share/apps/QtCurve/Murrine.qtcurve
-share/apps/QtCurve/Ozone.qtcurve
-share/apps/QtCurve/Plastic.qtcurve
-share/apps/QtCurve/QtCurveui.rc
-share/apps/QtCurve/Silk.qtcurve
-share/apps/color-schemes/QtCurve.colors
-share/apps/color-schemes/QtCurveAgua.colors
-share/apps/kstyle/themes/qtcurve.themerc
-share/apps/kwin/qtcurve.desktop
-share/locale/tr/LC_MESSAGES/qtcurve.mo
-@dirrm share/apps/QtCurve
+%%KDE4%%lib/kde4/kstyle_qtcurve_config.so
+%%KDE4%%lib/kde4/kwin3_qtcurve.so
+%%KDE4%%lib/kde4/kwin_qtcurve_config.so
+%%KDE4%%lib/kde4/plugins/styles/qtcurve.so
+%%KDE4%%share/apps/QtCurve/Agua.qtcurve
+%%KDE4%%share/apps/QtCurve/Agua_II.qtcurve
+%%KDE4%%share/apps/QtCurve/Curve.qtcurve
+%%KDE4%%share/apps/QtCurve/Flat.qtcurve
+%%KDE4%%share/apps/QtCurve/Human.qtcurve
+%%KDE4%%share/apps/QtCurve/Inverted.qtcurve
+%%KDE4%%share/apps/QtCurve/Klearlooks.qtcurve
+%%KDE4%%share/apps/QtCurve/Murrine.qtcurve
+%%KDE4%%share/apps/QtCurve/Ozone.qtcurve
+%%KDE4%%share/apps/QtCurve/Plastic.qtcurve
+%%KDE4%%share/apps/QtCurve/QtCurveui.rc
+%%KDE4%%share/apps/QtCurve/Silk.qtcurve
+%%KDE4%%share/apps/color-schemes/QtCurve.colors
+%%KDE4%%share/apps/kstyle/themes/qtcurve.themerc
+%%KDE4%%share/apps/kwin/qtcurve.desktop
+%%KDE4%%share/locale/tr/LC_MESSAGES/qtcurve.mo
+%%KDE4%%@dirrm share/apps/QtCurve
+%%QT4%%lib/qt4/plugins/styles/qtcurve.so
+%%QT4%%@dirrmtry lib/qt4/plugins/styles
--- kde4-style-qtcurve-1.4.1_1.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?201005222312.o4MNCZB0003106>