Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of
 ariel.constenla.haile@gmail.com designates 209.85.160.175 as permitted
 sender)
Date: Tue, 4 Oct 2011 11:57:02 -0300
From: Ariel Constenla-Haile <ariel.constenla.haile@gmail.com>
To: ooo-dev@incubator.apache.org
Subject: [CODE] DLLPOSTFIX issue in vcl unx desktop detection
Message-ID: <20111004145702.GA4255@localhost>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="wq9mPyueHGvFACwf"
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)

--wq9mPyueHGvFACwf
Content-Type: multipart/mixed; boundary="bp/iNruPH9dso1Pn"
Content-Disposition: inline


--bp/iNruPH9dso1Pn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi there,

Linux desktop detection is broken due to the changes with the
DLLPOSTFIX:

1) SAL_DLLPOSTFIX as defined in
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk=
?view=3Dmarkup#l174
   -DSAL_DLLPOSTFIX=3D\"$(gb_Library_OOOEXT)\" expands to ".so" and breaks =
loading
   the desktop detector library
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/pl=
ugadapt/salplug.cxx?view=3Dmarkup#l138
          OUStringBuffer aModName( 128 );
          aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
          aModName.appendAscii( SAL_DLLPOSTFIX ); // .so
          aModName.appendAscii( SAL_DLLEXTENSION ); // .so
          OUString aModule =3D aModName.makeStringAndClear();
  the module name will result in libdesktop_detector.so.so

2) loading the detected vcl plugin is also broken:
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/pl=
ugadapt/salplug.cxx?view=3Dmarkup#l66
   the module name misses the SAL_DLLEXTENSION
          OUStringBuffer aModName( 128 );
          aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
          aModName.append( rModuleBase );
          aModName.appendAscii( SAL_DLLPOSTFIX );
          OUString aModule =3D aModName.makeStringAndClear();
   Loading worked by luck because SAL_DLLPOSTFIX was defined as ".so"

The attached patch solves the issue defining SAL_DLLPOSTFIX as an empty str=
ing,
and adding the extension to the vcl plugin module name.

Regards
--=20
Ariel Constenla-Haile
La Plata, Argentina

--bp/iNruPH9dso1Pn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="vcl_DLLPOSTFIX_unx.diff"
Content-Transfer-Encoding: quoted-printable

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 635e0b4..6e8f5b3 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -171,7 +171,7 @@ ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_set_defs,vcl,\
 	$$(DEFS) \
     -DSAL_DLLPREFIX=3D\"$(gb_Library_SYSPRE)\" \
-    -DSAL_DLLPOSTFIX=3D\"$(gb_Library_OOOEXT)\" \
+    -DSAL_DLLPOSTFIX=3D\"\" \
     -D_XSALSET_LIBNAME=3D\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 ## handle fontconfig
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugad=
apt/salplug.cxx
index b85e4ac..d303485 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -67,6 +67,7 @@ static SalInstance* tryInstance( const OUString& rModuleB=
ase )
     aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
     aModName.append( rModuleBase );
     aModName.appendAscii( SAL_DLLPOSTFIX );
+    aModName.appendAscii( SAL_DLLEXTENSION );
     OUString aModule =3D aModName.makeStringAndClear();
=20
     oslModule aMod =3D osl_loadModuleRelative(

--bp/iNruPH9dso1Pn--

--wq9mPyueHGvFACwf
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOix6+AAoJEMjP1bm45QNWjv8QAKaBUocqX3koAy2fU1y3/9Qg
oLF9PeVx8hLduEAhVTBLlyPR0Wddc+q+DzgtlzBn2fQR6cLjhvY2Irlzb31qCezn
Opd0Mb2sqwlxQbBuvPvkq3/gvEmNMDDxRK/swlQDyFr8R9gvlqjeRA4YVF6Cm0Xa
nAtGh5wLXWvv7NGbfILN+f17gDxOXIpEiEHVDFzO0FJKFgLKWbLuDHoiKJGY8W0T
68T2048Haf78LNp9DSO89hFhjCw5sd+N12FYU+T9u5z/o8OD7IPfCZjL7IwZQA81
Vl1ZaOzV65YDndZ0/iDFA1LCZv6OI/Fc6NYBfO6AfDGeSMkC2cQ5nD+aAMHbxEDM
mFrjXHPvFQ4PeiBf+OedHybTmDOssckrCrF9hFNlW9CPjBjJdhYm1khNrMQn3WRT
O6zEqklF+ADnIFK+/TVvF0os36w9M2lsc4aaIuUE6wMqemGk4FnHv3Ey5wRyJ+gL
WD7jvO50hVIt8uL7z+n070S7Q1GOJrxdKQdm4EydWEPJRoG/g5to9XxcR31EAiM6
w6XXbcHl7MCHWrZqTOH6z05evHPt9do4tJ1ib+5Up3jxP/Vop7mhwRuCrTVO6vop
/m8MXdx5NI7i5UusFm1ZNpawLHKiHSaXQzikVUWuIcotFuIngaI8nsykxybHgZ0Q
IVBSC70BagFYIWm8I3qh
=AbHh
-----END PGP SIGNATURE-----

--wq9mPyueHGvFACwf--