Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Oct 2012 17:24:58 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305386 - in head/x11-themes/gtk-qt4-engine: . files
Message-ID:  <201210061724.q96HOw2c004724@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Sat Oct  6 17:24:57 2012
New Revision: 305386
URL: http://svn.freebsd.org/changeset/ports/305386

Log:
   - Change PORTNAME to original gtk-qt-engine
   - Add patch to fix build
   - Mark MAKE_JOBS_SAFE
   - Improve COMMENT and description, update WWW
   - Don't remove common directories installed by gtk and kdehier ports
   - make bapt@ more happy (by converting to new options framework :)
   - do respect option

Added:
  head/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c   (contents, props changed)
Modified:
  head/x11-themes/gtk-qt4-engine/Makefile
  head/x11-themes/gtk-qt4-engine/pkg-descr   (contents, props changed)
  head/x11-themes/gtk-qt4-engine/pkg-plist   (contents, props changed)

Modified: head/x11-themes/gtk-qt4-engine/Makefile
==============================================================================
--- head/x11-themes/gtk-qt4-engine/Makefile	Sat Oct  6 16:12:48 2012	(r305385)
+++ head/x11-themes/gtk-qt4-engine/Makefile	Sat Oct  6 17:24:57 2012	(r305386)
@@ -1,19 +1,14 @@
-# New ports collection makefile for:    gtk-qt4-engine
-# Date created:                         07 July 2008
-# Whom:                                 Kris Moore <kris@pcbsd.org>
-#
+# Created by: Kris Moore <kris@pcbsd.org>
 # $FreeBSD$
-#
 
-PORTNAME=	gtk-qt4-engine
+PORTNAME=	gtk-qt-engine
 PORTVERSION=	1.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://gtk-qt-engine.googlecode.com/files/
-DISTFILES=	gtk-qt-engine-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
+COMMENT=	GTK+ 2.x theme engine allowing to use Qt/KDE styles
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -21,21 +16,25 @@ USE_GNOME=	gtk20
 USE_QT4=	moc_build rcc_build uic_build qmake_build
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdeprefix automoc4
+WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	LIBBONOBOUI "Install libbonoboui if missing" off
+OPTIONS_DEFINE=	BONOBO
+BONOBO_DESC=	Better support for Bonobo (GNOME) framework
 
-WRKSRC=		${WRKDIR}/gtk-qt-engine
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LIBBONOBOUI)
+.if ${PORT_OPTIONS:MBONOBO}
 USE_GNOME+=	libbonoboui
 .endif
 
 post-patch:
+.if !${PORT_OPTIONS:MBONOBO}
+	@${REINPLACE_CMD} -e '/^PKGCONFIG(libbonoboui/d' \
+		${WRKSRC}/CMakeLists.txt
+.endif
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/kcm_gtk/searchpaths.cpp
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
+		${WRKSRC}/kcm_gtk/searchpaths.cpp \
 		${WRKSRC}/src/rcproperties.cpp
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c	Sat Oct  6 17:24:57 2012	(r305386)
@@ -0,0 +1,10 @@
+--- ./src/qt_theme_draw.c.orig	2008-03-11 01:30:19.000000000 +0000
++++ ./src/qt_theme_draw.c	2012-10-06 10:09:43.994767020 +0000
+@@ -19,6 +19,7 @@
+  ***************************************************************************/
+ 
+ #include <math.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <gtk/gtkprogressbar.h>
+ #include <gdk/gdk.h>

Modified: head/x11-themes/gtk-qt4-engine/pkg-descr
==============================================================================
--- head/x11-themes/gtk-qt4-engine/pkg-descr	Sat Oct  6 16:12:48 2012	(r305385)
+++ head/x11-themes/gtk-qt4-engine/pkg-descr	Sat Oct  6 17:24:57 2012	(r305386)
@@ -1,6 +1,5 @@
-GTK-QT4 Theme Engine allows GTK2 apps to use QT/KDE themes
-so that they fit in more nicely with KDE. Includes a KDE4
-system settings module for GTK theme selection.
+GTK-Qt theme engine allows GTK+ 2.x applications to use Qt4 styles
+so that they fit in more nicely with KDE desktop. The port also
+provides KDE 4 system settings module for GTK+ theme selection.
 
-Author: David Sansome <me@davidsansome.com>
-WWW: http://gtk-qt.ecs.soton.ac.uk/index.php
+WWW: http://code.google.com/p/gtk-qt-engine/

Modified: head/x11-themes/gtk-qt4-engine/pkg-plist
==============================================================================
--- head/x11-themes/gtk-qt4-engine/pkg-plist	Sat Oct  6 16:12:48 2012	(r305385)
+++ head/x11-themes/gtk-qt4-engine/pkg-plist	Sat Oct  6 17:24:57 2012	(r305386)
@@ -11,13 +11,8 @@ share/locale/nn/LC_MESSAGES/gtkqtengine.
 share/locale/ru/LC_MESSAGES/gtkqtengine.mo
 share/locale/sv/LC_MESSAGES/gtkqtengine.mo
 share/locale/tr/LC_MESSAGES/gtkqtengine.mo
-@dirrmtry share/applications/kde4
-@dirrmtry lib/kde4
 @cwd %%LOCALBASE%%
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqt4engine.so
 share/themes/Qt4/gtk-2.0/gtkrc
 @dirrm share/themes/Qt4/gtk-2.0
 @dirrm share/themes/Qt4
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
-@dirrmtry lib/gtk-2.0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210061724.q96HOw2c004724>