ports/116058: Update: x11-themes/gtk-qt-engine to version 0.8

Tue Sep 4 00:20:07 UTC 2007

The following reply was made to PR ports/116058; it has been noted by GNATS.

From: Danny Pansters <danny at ricin.com>
To: bug-followup at freebsd.org,
 malus.x at gmail.com
Cc:  
Subject: Re: ports/116058: Update: x11-themes/gtk-qt-engine to version 0.8
Date: Tue, 4 Sep 2007 02:16:57 +0200

 --Boundary-00=_6PK3G9LDhbo44LE
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline

 Edwin or other: please use attached diff for commit. It's reasonably well 
 tested. I'll take any fallout (as usual)

 Hi Dave,

 Thanks for the PR. I wasn't aware of a gtk-qt-engine update yet. Also quite 
 new to cmake. Please note that generally for existing ports diffs are used, 
 and shars for new ports (though if you need to add a dir shar or tar are much 
 easier to use).

 I've used your PR but reworked/changed it for a few things:

 - having GTK_LIB_DIR etc also be passed as CMAKE_ARGS (based in LOCALBASE, I 
 reckon that for this that's better tha PREFIX but this may be debatable), 
 that way we don't need a patch or a files/ directory at all. Another 
 possiblity is to use REINPLACE_CMD (sed) for these things, pre-configure.

 - re-add lib dependency on kdecore. The kcm module build really requires 
 kdecore. And I think also for running.

 - I like the CMAKE_ARGS way of passing CXX and friends that you used, kept 
 that in, also used a CMAKE variable for the cmake path, which I expect a new 
 bsd.cmake.mk to so in the near future (as well as probably providing a 
 canned-in way to add common cmake args).

 - I noticed you using the pre-build target, while you probably wanted to 
 override the do-configure target. To do that you use do-configure and set 
 HAS_CONFIGURE=yes. Well, that's what I did at least :)

 I tested on tinderbuild/STABLE and also tested building with gcc42, and 
 limited runtime testing (that is: look at abiword's GUI)

 Thanks!

 Dan

 --Boundary-00=_6PK3G9LDhbo44LE
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="x11-themes__gtk-qt-engine.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="x11-themes__gtk-qt-engine.diff"

 diff -ruN x11-themes/gtk-qt-engine.new/Makefile x11-themes/gtk-qt-engine/Makefile
 --- x11-themes/gtk-qt-engine.new/Makefile	2007-09-04 01:57:01.000000000 +0200
 +++ x11-themes/gtk-qt-engine/Makefile	2007-05-19 22:30:19.000000000 +0200
 @@ -6,46 +6,50 @@
  #

  PORTNAME=	gtk-qt-engine
 -PORTVERSION=	0.8
 -PORTREVISION=	# zero
 +PORTVERSION=	0.7
 +PORTREVISION=	6
  CATEGORIES=	x11-themes
  MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
  		http://freebsd.ricin.com/ports/distfiles/

  MAINTAINER=	danny at ricin.com
 -COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
 +COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes

  LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
 -BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake

  USE_BZIP2=	yes
 -USE_GETTEXT=	yes
  USE_GMAKE=	yes
 +USE_AUTOTOOLS=	libtool:15
  USE_GNOME=	gtk20
 -USE_LDCONFIG=	yes
  USE_QT_VER=	3
 -HAS_CONFIGURE=	yes
 -
 -OPTIONS=	LIBBONOBOUI "Install libbonoboui if missing" off

  WRKSRC=		${WRKDIR}/${PORTNAME}
 -CMAKE=		${LOCALBASE}/bin/cmake
 -CMAKE_ARGS=	-DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}"\
 -		-DCMAKE_C_COMPILER:STRING="${CC}" \
 -		-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
 -		-DCMAKE_C_FLAGS:STRING="${CFLAGS}"\
 -		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"\
 -		-DGTK_LIB_DIR:PATH="${LOCALBASE}"\
 -		-DGTK_PREFIX:PATH="${LOCALBASE}"\
 -		-DKDE3_LIB_DIR:PATH="${LOCALBASE}"
 +
 +CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 +
 +OPTIONS=	LIBBONOBOUI "Install libbonoboui if missing" off

  .include <bsd.port.pre.mk>

 +# Note: had to turn off libbonoboui (dependency) OPTION for technical reasons
 +# So a "vanilla" package will have no libbonoboui support
  .if defined(WITH_LIBBONOBOUI)
  USE_GNOME+=	libbonoboui
  .endif

 -do-configure:
 -	cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} .
 +post-patch:
 +	@${REINPLACE_CMD} -e "s|GTK_LIBPREFIX)/gtk|PREFIX)/lib/gtk|" \
 +		${WRKSRC}/src/Makefile.in
 +	@${REINPLACE_CMD} -e "s|GTK_PREFIX)/share|PREFIX)/share|g" \
 +		${WRKSRC}/src/Makefile.in
 +	@${REINPLACE_CMD} -e "s|/usr/lib/menu|${WRKDIR}/menu|g" \
 +		${WRKSRC}/kcm_gtk/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		"s|/usr/share/applications|${PREFIX}/share/applications/kde|g" \
 +		${WRKSRC}/kcm_gtk/Makefile.in
 +
 +post-install:
 +	@${RM} -r ${WRKDIR}/menu
 +	@${RM} ${PREFIX}/share/applnk/Settings/LookNFeel/kcmgtk.desktop

  .include <bsd.port.post.mk>
 diff -ruN x11-themes/gtk-qt-engine.new/distinfo x11-themes/gtk-qt-engine/distinfo
 --- x11-themes/gtk-qt-engine.new/distinfo	2007-09-03 23:29:23.000000000 +0200
 +++ x11-themes/gtk-qt-engine/distinfo	2006-08-05 00:44:33.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (gtk-qt-engine-0.8.tar.bz2) = 9fe75b7765b6a5b49901fcd6f4f4aa4b
 -SHA256 (gtk-qt-engine-0.8.tar.bz2) = 6658bdbd3f2120d34f5c59b5bc3cfed5ef83a2aa8572d775483aa304396b0d45
 -SIZE (gtk-qt-engine-0.8.tar.bz2) = 59472
 +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.new/pkg-descr x11-themes/gtk-qt-engine/pkg-descr
 --- x11-themes/gtk-qt-engine.new/pkg-descr	2007-09-04 00:16:07.000000000 +0200
 +++ x11-themes/gtk-qt-engine/pkg-descr	2007-02-08 23:31:56.000000000 +0100
 @@ -1,4 +1,4 @@
 -GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
 +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.

 diff -ruN x11-themes/gtk-qt-engine.new/pkg-plist x11-themes/gtk-qt-engine/pkg-plist
 --- x11-themes/gtk-qt-engine.new/pkg-plist	2007-09-03 23:41:48.000000000 +0200
 +++ x11-themes/gtk-qt-engine/pkg-plist	2007-05-19 22:30:19.000000000 +0200
 @@ -1,22 +1,16 @@
 +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.a
 +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.la
  lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.so
 +lib/kde3/kcm_kcmgtk.a
  lib/kde3/kcm_kcmgtk.la
  lib/kde3/kcm_kcmgtk.so
 -share/applications/kcmgtk.desktop
 -share/locale/bg/LC_MESSAGES/gtkqtengine.mo
 +share/gtk-qt-engine/kde-index.theme
 +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/it/LC_MESSAGES/gtkqtengine.mo
  share/locale/nn/LC_MESSAGES/gtkqtengine.mo
 -share/locale/ru/LC_MESSAGES/gtkqtengine.mo
 -share/locale/sv/LC_MESSAGES/gtkqtengine.mo
 -share/locale/tr/LC_MESSAGES/gtkqtengine.mo
  share/themes/Qt/gtk-2.0/gtkrc
  @dirrm share/themes/Qt/gtk-2.0
  @dirrm share/themes/Qt
 - at dirrmtry share/themes
 - at dirrmtry share/applications
 - at dirrmtry lib/kde3
 - at dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
 - at dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
 - at dirrmtry lib/gtk-2.0
 + at dirrm share/gtk-qt-engine

 --Boundary-00=_6PK3G9LDhbo44LE--