Date: Tue, 4 Sep 2007 23:30:07 GMT From: Danny Pansters <danny@ricin.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/116058: Update: x11-themes/gtk-qt-engine to version 0.8 Message-ID: <200709042330.l84NU7Zi017647@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/116058; it has been noted by GNATS.
From: Danny Pansters <danny@ricin.com>
To: Dave Grochowski <malus.x@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: ports/116058: Update: x11-themes/gtk-qt-engine to version 0.8
Date: Wed, 5 Sep 2007 01:24:57 +0200
--Boundary-00=_Jle3GqCXklqw7ev
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
<snip>
> 1. GTK_LIB_DIR should be set to "${LOCALBASE}/lib".
>
> 2. Similarly, KDE3_LIB_DIR should be set to "${LOCALBASE}/lib".
>
> 3. You cannot pass in GTK_PREFIX, GTK_LIB_DIR, and KDE3_LIB_DIR like
> that. The values for those are actually pulled from pkg-config. Any
> parameters passed in will be overwritten anyway when the calls to
> pkg-config are made.
Ooow, ok. Yes you're right. Hehe.
> Does it make more sense to pass in the values for those or just use
> pkg-config to figure them out? The former will require a little more
> work to achieve, either with some sed magic or a patch.
I don't know much about pkg-config (gnome stuff ;-), but I think that
considering that the package will only work if installed in the right place,
this is the kind of package where it's better to not pretend. It *must* be in
the gtk theme dir, it *must* be in the kcm dir. PREFIX is useful for packages
that are pretty much self hosted, here it's probably better to not use it at
all. If a user would want a large body of software (kde,gnome) working
together installed in a non standard place they would/should change LOCALBASE
or maybe DESTDIR.
Besides, since pkg-config seems to do the right thing, I don't see a reason
not to just use what it comes up with unless it breaks something. They
probably thought harder about it than I did.
> > - re-add lib dependency on kdecore. The kcm module build really requires
> > kdecore. And I think also for running.
>
> Whoops, that was an accident.
Wonder why I never used USE_KDEBASE_VER there, well, let's do it now!
> > - 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 was going to suggest making it:
>
> CMAKE?= ${LOCALBASE}/bin/cmake
Yes, that's better.
> However, I suppose the Makefile will be edited anyway after the
> introduction of bsd.cmake.mk, so the point is irrelevant.
Well, I'm not saying there will be one, rather that I think eventually there
will be one (with kde4 and all).
> > - 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 :)
>
> Ok, makes more sense.
>
> > I tested on tinderbuild/STABLE and also tested building with gcc42, and
> > limited runtime testing (that is: look at abiword's GUI)
> >
> > Thanks!
> >
> > Dan
>
> Well, your update to the port works fine for me as well.
>
> Sincerely,
> Dave Grochowski
Attached is a reworked and simplified version (e.g. rely on pkg-config since
it seems to be doing its job alright) of the port, now also using
USE_KDEBASE_VER as should.
Thanks,
Dan
--Boundary-00=_Jle3GqCXklqw7ev
Content-Type: text/x-diff;
charset="iso-8859-1";
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/Makefile x11-themes/gtk-qt-engine.new/Makefile
--- x11-themes/gtk-qt-engine/Makefile 2007-05-19 22:30:19.000000000 +0200
+++ x11-themes/gtk-qt-engine.new/Makefile 2007-09-05 00:53:41.000000000 +0200
@@ -6,50 +6,41 @@
#
PORTNAME= gtk-qt-engine
-PORTVERSION= 0.7
-PORTREVISION= 6
+PORTVERSION= 0.8
+PORTREVISION= # zero
CATEGORIES= x11-themes
MASTER_SITES= http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
http://freebsd.ricin.com/ports/distfiles/
MAINTAINER= danny@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_QT_VER= 3
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
-CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+USE_KDEBASE_VER=3
+HAS_CONFIGURE= yes
OPTIONS= LIBBONOBOUI "Install libbonoboui if missing" off
+WRKSRC= ${WRKDIR}/${PORTNAME}
+CMAKE?= ${LOCALBASE}/bin/cmake
+CMAKE_ARGS= -DCMAKE_C_COMPILER:STRING="${CC}"\
+ -DCMAKE_CXX_COMPILER:STRING="${CXX}"\
+ -DCMAKE_C_FLAGS:STRING="${CFLAGS}"\
+ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
+
.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
-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
+do-configure:
+ cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} .
.include <bsd.port.post.mk>
diff -ruN x11-themes/gtk-qt-engine/distinfo x11-themes/gtk-qt-engine.new/distinfo
--- x11-themes/gtk-qt-engine/distinfo 2006-08-05 00:44:33.000000000 +0200
+++ x11-themes/gtk-qt-engine.new/distinfo 2007-09-03 23:29:23.000000000 +0200
@@ -1,3 +1,3 @@
-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
+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
diff -ruN x11-themes/gtk-qt-engine/pkg-descr x11-themes/gtk-qt-engine.new/pkg-descr
--- x11-themes/gtk-qt-engine/pkg-descr 2007-02-08 23:31:56.000000000 +0100
+++ x11-themes/gtk-qt-engine.new/pkg-descr 2007-09-04 00:16:07.000000000 +0200
@@ -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/pkg-plist x11-themes/gtk-qt-engine.new/pkg-plist
--- x11-themes/gtk-qt-engine/pkg-plist 2007-05-19 22:30:19.000000000 +0200
+++ x11-themes/gtk-qt-engine.new/pkg-plist 2007-09-03 23:41:48.000000000 +0200
@@ -1,16 +1,22 @@
-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/gtk-qt-engine/kde-index.theme
-share/applications/kde/kcmgtk-xdg.desktop
+share/applications/kcmgtk.desktop
+share/locale/bg/LC_MESSAGES/gtkqtengine.mo
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
-@dirrm share/gtk-qt-engine
+@dirrmtry share/themes
+@dirrmtry share/applications
+@dirrmtry lib/kde3
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
+@dirrmtry lib/gtk-2.0
--Boundary-00=_Jle3GqCXklqw7ev--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709042330.l84NU7Zi017647>