Date: Sun, 13 May 2007 23:53:11 +0200 From: Danny Pansters <danny@ricin.com> To: Kris Kennaway <kris@obsecurity.org> Cc: freebsd-ports@freebsd.org Subject: Re: first? patch [ HEADS UP: xorg 7.2 ready for testing ] Message-ID: <200705132353.11377.danny@ricin.com> In-Reply-To: <20070512033828.GC43256@xor.obsecurity.org> References: <20070510212817.GA67897@xor.obsecurity.org> <200705120437.18298.danny@ricin.com> <20070512033828.GC43256@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_Hj4RG3tlXXw5wxz Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Saturday 12 May 2007 05:38:28 you wrote: > On Sat, May 12, 2007 at 04:37:17AM +0200, Danny Pansters wrote: > > On Saturday 12 May 2007 03:12:49 Kris Kennaway wrote: > > > On Sat, May 12, 2007 at 02:35:00AM +0200, Danny Pansters wrote: > > > > I ran into a little problem with the gstreamer-plugins, to be exact > > > > with the 'bad' plugin. What's in a name. Attached patch to > > > > gstreamer-plugins which eliminates X11BASE from configure args fixes > > > > it. > > > > > > This actually seems to indicate that something you have installed > > > references /usr/X11R6 in a .la file. I actually built this > > > > Maybe portupgrade's backup libs? > > No, the .la files are not preserved by portupgrade. The only files > that should reference this are those that are yet to be upgraded, but > apparently you have others that should have gone away when the ports > were rebuilt. > > > I know X11BASE shouldn't pose a problem but > > apparently it does in this case. > > It doesn't make any sense: a NOP patch cannot solve a problem :) The > only solution is if it's not actually a NOP because X11BASE != > LOCALBASE for you, or something else changed in the meantime. > > Are you running on an older (<6.2) system? Do you have X11R6 set in > your /etc/make.conf? > > Kris Erm, I'm pretty sure that I was running this in the wrong environment :) without XORG_UPGRADE set. I'm so used to using multiple consoles ... Nonetheless removing XBASE from the gstreamer-plugin parent port did help to get it to build. Not sure why though. Sorry for late reply, just finished upgrading my meager 850 packages. Things run now. I have a patch for x11-toolkits/py-qt (fails to build if Qt4 is (also) installed) and for x11-themes/gtk-qt-engine (remove CONFIGURE_ARGS line that used to be needed to get it to use X11BASE). Both attached. I'm not sure whether or not to bump PORTREVISION compared to the xorg ports tarball. I did for these diffs, figured it can't hurt if it ends up being a double bump. Dan --Boundary-00=_Hj4RG3tlXXw5wxz 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.old/Makefile x11-themes/gtk-qt-engine/Makefile --- x11-themes/gtk-qt-engine.old/Makefile Sun May 13 21:22:25 2007 +++ x11-themes/gtk-qt-engine/Makefile Sun May 13 21:52:52 2007 @@ -7,7 +7,7 @@ PORTNAME= gtk-qt-engine PORTVERSION= 0.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-themes MASTER_SITES= http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \ http://freebsd.ricin.com/ports/distfiles/ @@ -24,8 +24,6 @@ USE_QT_VER= 3 WRKSRC= ${WRKDIR}/${PORTNAME} - -CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include OPTIONS= LIBBONOBOUI "Install libbonoboui if missing" off --Boundary-00=_Hj4RG3tlXXw5wxz Content-Type: text/x-diff; charset="iso-8859-1"; name="x11-toolkits__py-qt.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="x11-toolkits__py-qt.diff" diff -ruN x11-toolkits/py-qt.old/Makefile x11-toolkits/py-qt/Makefile --- x11-toolkits/py-qt.old/Makefile Sun May 13 20:12:28 2007 +++ x11-toolkits/py-qt/Makefile Sun May 13 20:12:49 2007 @@ -6,7 +6,7 @@ PORTNAME= qt PORTVERSION= 3.17.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/ \ diff -ruN x11-toolkits/py-qt.old/files/patch-configure.py x11-toolkits/py-qt/files/patch-configure.py --- x11-toolkits/py-qt.old/files/patch-configure.py Thu Jan 1 01:00:00 1970 +++ x11-toolkits/py-qt/files/patch-configure.py Sun May 13 20:14:50 2007 @@ -0,0 +1,21 @@ +--- configure.py.orig Sun May 13 20:08:01 2007 ++++ configure.py Sun May 13 20:14:01 2007 +@@ -1081,15 +1081,12 @@ + macros["LIBDIR_QT"] = qt_libdir + + # Check the Qt header files have been installed. Quietly check for Qt v4. +- qt4_d = os.path.join(qt_incdir, "QtCore") ++ # NO. This won't allow having both PyQt3 and PyQt4. Check for Qt3 only. + +- qglobal = os.path.join(qt4_d, "qglobal.h") ++ qglobal = os.path.join(qt_incdir, "qglobal.h") + + if not os.access(qglobal, os.F_OK): +- qglobal = os.path.join(qt_incdir, "qglobal.h") +- +- if not os.access(qglobal, os.F_OK): +- sipconfig.error("qglobal.h could not be found in %s." % qt_incdir) ++ sipconfig.error("qglobal.h could not be found in %s." % qt_incdir) + + # Get the Qt version number. + global qt_version --Boundary-00=_Hj4RG3tlXXw5wxz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705132353.11377.danny>