Mozilla-linux-gtk1 doesn't work with linux-xorg-libs

[mag at intron.ac]

     The RPM "xorg-x11-deprecated-libs" takes its effects! Both
Firefox-linux-gtk2 1.0.7 and Mozilla-linux-gtk1 work now. Thanks, Boris.

     Actually, quite a few days ago, I had found that Firefox-linux-gtk2
1.0.7 reported that it requires "libXp.so.*" while Mozilla-linux-gtk1
hung up quietly only. But since I prefer Mozilla-linux-gtk1 for its better
display of both oriental and western language fonts and eager to solve it,
I ignored Firefox-linux-gtk2 1.0.7's prompt.

     Boris, could you tell me how you found that Mozilla-linux-gtk1 also
needs "libXp.so.*" though it keeps quiet for that? It seems that only
"libgfxxprint.so" and "libgfx_gtk.so" needs "libXp.so.*". On the other
hand "firefox-bin" (version 1.0.7) needs "libXp.so.*" itself and dynamic
linker can report on lacking of "libXp.so.*".

     I have modified Boris's patch to avoid forcing user to install
source RPM. See attachment in this mail.
     Alexander, I believe you may commit Boris's patch now.

     P.S. current "x11/linux-xorg-libs" is just from Fedora Core 4 while
the focused port "emulators/linux_base-fc3" is part of Fedora Core 3.
------------------------------------------------------------------------
                                                From Beijing, China

Boris Samorodov wrote:

> On Sat, 13 May 2006 00:01:17 +0800 mag at intron.ac wrote:
> 
>>      Mozilla-linux-gtk1 (www/linux-mozilla) will hang up against
>> linux-xorg-libs (FC3, 4). This has been confusing me in last several days.
>> But Mozilla-linux-gtk1 works with linux-XFree86-libs-4.3.99.902_7.
>> ------------------------------------------------------------------------
>>                                                 From Beijing, China
> 
> The problem is that linux-mozilla uses an old and deprecated
> libXp.so.6.
> 
> Please, test attached patch and give me a feedback.
> 
> To apply the patch:
> 
> 1. Copy the patch to /usr/ports/x11 directory.
> 2. Apply the patch:
>    # cd /usr/ports/x11
>    # patch -p0 < _the_patch_
> 3. Reinstall the port, ex. portupgrade or make deinstall/install.
> 
> 
> WBR
> -- 
> Boris B. Samorodov, Research Engineer
> InPharmTech Co,     http://www.ipt.ru
> Telephone & Internet Service Provider



-------------- next part --------------
diff -ur linux-xorg-libs.orig/Makefile linux-xorg-libs/Makefile
--- linux-xorg-libs.orig/Makefile	Thu May  4 02:58:55 2006
+++ linux-xorg-libs/Makefile	Sat May 13 09:47:27 2006
@@ -7,9 +7,10 @@
 
 PORTNAME=		xorg-libs
 PORTVERSION=		6.8.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		x11 linux
-DISTNAME=		xorg-x11-libs-${PORTVERSION}-37.FC4.49.2
+DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
+EXTRACT_ONLY=		${BIN_DISTFILES}
 
 MAINTAINER=		freebsd-emulation at FreeBSD.org
 COMMENT=		Xorg libraries, linux binaries
@@ -20,6 +21,13 @@
 LINUX_DIST_VER=		4
 INSTALLS_SHLIB=		yes
 
+BIN_DISTFILES=		xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.${LINUX_RPM_ARCH}.rpm \
+			xorg-x11-deprecated-libs-6.8.2-31.${LINUX_RPM_ARCH}.rpm
+
+.if defined(PACKAGE_BUILDING)
 SRC_DISTFILES=		xorg-x11-6.8.2-37.FC4.49.2.src.rpm
+.else
+SRC_DISTFILES=
+.endif
 
 .include <bsd.port.mk>
diff -ur linux-xorg-libs.orig/distinfo.i386 linux-xorg-libs/distinfo.i386
--- linux-xorg-libs.orig/distinfo.i386	Mon May  1 06:14:08 2006
+++ linux-xorg-libs/distinfo.i386	Sat May 13 09:40:56 2006
@@ -1,6 +1,9 @@
 MD5 (rpm/i386/fedora/4/xorg-x11-libs-6.8.2-37.FC4.49.2.i386.rpm) = f60dd3ea9c845a85ca5f8215f67b33c4
 SHA256 (rpm/i386/fedora/4/xorg-x11-libs-6.8.2-37.FC4.49.2.i386.rpm) = 87b9f2129bc51c1d6438f7f158979d9e1cd670dbfcd944a02310565b991e0a69
 SIZE (rpm/i386/fedora/4/xorg-x11-libs-6.8.2-37.FC4.49.2.i386.rpm) = 2655615
+MD5 (rpm/i386/fedora/4/xorg-x11-deprecated-libs-6.8.2-31.i386.rpm) = 3afd57cabdfa08736dcd7bdc3c86176f
+SHA256 (rpm/i386/fedora/4/xorg-x11-deprecated-libs-6.8.2-31.i386.rpm) = 545e9b6ee957e7443dbe88206213c84c56a4584f4c8e583cd51c98407490c145
+SIZE (rpm/i386/fedora/4/xorg-x11-deprecated-libs-6.8.2-31.i386.rpm) = 83231
 MD5 (rpm/i386/fedora/4/xorg-x11-6.8.2-37.FC4.49.2.src.rpm) = 92491828b6bf332b84bca2cd64ebd3c2
 SHA256 (rpm/i386/fedora/4/xorg-x11-6.8.2-37.FC4.49.2.src.rpm) = 0a2eb1ecc43780cfd3e78bcb64057384d0c592393589500d34baa4292628b2f7
 SIZE (rpm/i386/fedora/4/xorg-x11-6.8.2-37.FC4.49.2.src.rpm) = 56066059
diff -ur linux-xorg-libs.orig/pkg-plist linux-xorg-libs/pkg-plist
--- linux-xorg-libs.orig/pkg-plist	Thu May  4 02:58:55 2006
+++ linux-xorg-libs/pkg-plist	Sat May 13 09:39:24 2006
@@ -197,6 +197,8 @@
 usr/X11R6/lib/libXmu.so.6.2
 usr/X11R6/lib/libXmuu.so.1
 usr/X11R6/lib/libXmuu.so.1.0
+usr/X11R6/lib/libXp.so.6
+usr/X11R6/lib/libXp.so.6.2
 usr/X11R6/lib/libXpm.so.4
 usr/X11R6/lib/libXpm.so.4.11
 usr/X11R6/lib/libXrandr.so.2