[Buildroot] [PATCH 1/3] pcmanfm: link against libX11 to avoid build failure

[Buildroot] [PATCH 1/3] pcmanfm: link against libX11 to avoid build failure

[Thomas Petazzoni]

Fixes:

/home/test/outputs/allpkg/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/4.7.3/../../../../arm-linux-gnueabihf/bin/ld: fm-desktop.o: undefined reference to symbol 'XSendEvent'
/home/test/outputs/allpkg/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/4.7.3/../../../../arm-linux-gnueabihf/bin/ld: note: 'XSendEvent' is defined in DSO /home/test/outputs/allpkg/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libX11.so.6 so try adding it to the linker command line
/home/test/outputs/allpkg/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libX11.so.6: could not read symbols: Invalid operation
collect2: error: ld returned 1 exit status
make[4]: *** [pcmanfm] Error 1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pcmanfm/pcmanfm-link-against-libx11.patch |   20 ++++++++++++++++++++
 package/pcmanfm/pcmanfm.mk                        |    1 +
 2 files changed, 21 insertions(+)
 create mode 100644 package/pcmanfm/pcmanfm-link-against-libx11.patch

diff --git a/package/pcmanfm/pcmanfm-link-against-libx11.patch b/package/pcmanfm/pcmanfm-link-against-libx11.patch
new file mode 100644
index 0000000..f571e77
--- /dev/null
+++ b/package/pcmanfm/pcmanfm-link-against-libx11.patch
@@ -0,0 +1,20 @@
+Link against libX11
+
+fm-desktop.c uses XSendEvent, so we should link against libX11.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -12,7 +12,8 @@
+ 
+ pkg_modules="gtk+-2.0 >= 2.6.0 \
+              gthread-2.0 \
+-             libstartup-notification-1.0"
++             libstartup-notification-1.0 \
++	     x11"
+ 
+ AC_FUNC_MMAP
+ 
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 1f1a330..e4c23ec 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -8,6 +8,7 @@ PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_AUTORECONF = YES
 
 $(eval $(autotools-package))
 
-- 
1.7.9.5

[Buildroot] [PATCH 2/3] pcmanfm: use a download URL from downloads.sourceforge.net

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pcmanfm/pcmanfm.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index e4c23ec..8eaa485 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -5,7 +5,7 @@
 #############################################################
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
-PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
+PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%200.3.5.9/
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
 PCMANFM_AUTORECONF = YES
-- 
1.7.9.5

[Buildroot] [PATCH 3/3] pcmanfm: replace dependency on X.org server by dependency on libX11

[Thomas Petazzoni]

There is no reason for a client program like pcmanfm to depend on the
X.org server. Instead, it should depend on the appropriate X
client libraries, in this case libX11.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pcmanfm/Config.in  |    1 +
 package/pcmanfm/pcmanfm.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index c8b4deb..484192b 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_PCMANFM
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_GAMIN
 	select BR2_PACKAGE_STARTUP_NOTIFICATION
+	select BR2_PACKAGE_XLIB_LIBX11
 	depends on BR2_PACKAGE_LIBGTK2
 	help
 	  An extremly fast and lightweight file manager which features
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 8eaa485..d1c8afb 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,7 +7,7 @@ PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%200.3.5.9/
 PCMANFM_CONF_OPT = --disable-hal
-PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX11
 PCMANFM_AUTORECONF = YES
 
 $(eval $(autotools-package))
-- 
1.7.9.5

[Buildroot] [PATCH 2/3] pcmanfm: use a download URL from downloads.sourceforge.net

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/pcmanfm/pcmanfm.mk |    2 +-
 Thomas>  1 file changed, 1 insertion(+), 1 deletion(-)

 Thomas> diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
 Thomas> index e4c23ec..8eaa485 100644
 Thomas> --- a/package/pcmanfm/pcmanfm.mk
 Thomas> +++ b/package/pcmanfm/pcmanfm.mk
 Thomas> @@ -5,7 +5,7 @@
 Thomas>  #############################################################
 Thomas>  PCMANFM_VERSION = 0.3.5.9
 Thomas>  PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 Thomas> -PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 Thomas> +PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%200.3.5.9/

I changed this to use PCMANFM_VERSION instead of hardcoding 0.3.5.9 here
and committed all 3, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/3] pcmanfm: use a download URL from downloads.sourceforge.net

[Thomas Petazzoni]

Dear Peter Korsgaard,

On Wed, 19 Dec 2012 14:52:59 +0100, Peter Korsgaard wrote:

> I changed this to use PCMANFM_VERSION instead of hardcoding 0.3.5.9 here
> and committed all 3, thanks.

Indeed, thanks.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com