* [Buildroot] [PATCH v2 2/4] menu-cache: new package
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
@ 2014-11-21 15:33 ` Vicente Olivert Riera
2014-12-10 21:05 ` Yann E. MORIN
2015-07-13 0:20 ` Thomas Petazzoni
2014-11-21 15:33 ` [Buildroot] [PATCH v2 3/4] libfm: " Vicente Olivert Riera
` (5 subsequent siblings)
6 siblings, 2 replies; 19+ messages in thread
From: Vicente Olivert Riera @ 2014-11-21 15:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v1 -> v2: Remove GETTEXT and LIBICONV lines. Copy/Paste error
package/Config.in | 1 +
| 15 +++++++++++++++
| 2 ++
| 17 +++++++++++++++++
4 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 package/menu-cache/Config.in
create mode 100644 package/menu-cache/menu-cache.hash
create mode 100644 package/menu-cache/menu-cache.mk
diff --git a/package/Config.in b/package/Config.in
index 7b544cd..56b71e4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -662,6 +662,7 @@ menu "Graphics"
source "package/libungif/Config.in"
source "package/libva/Config.in"
source "package/libva-intel-driver/Config.in"
+ source "package/menu-cache/Config.in"
source "package/opencv/Config.in"
source "package/opengl/Config.in"
source "package/pango/Config.in"
--git a/package/menu-cache/Config.in b/package/menu-cache/Config.in
new file mode 100644
index 0000000..5327eae
--- /dev/null
+++ b/package/menu-cache/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_MENU_CACHE
+ bool "menu-cache"
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBFM_EXTRA
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+ depends on BR2_USE_MMU # libglib2
+ help
+ Small library from LXDE project used for application menu integration
+
+ http://wiki.lxde.org/
+
+comment "menu-cache needs a toolchain w/ wchar, threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
--git a/package/menu-cache/menu-cache.hash b/package/menu-cache/menu-cache.hash
new file mode 100644
index 0000000..3b9e5c4
--- /dev/null
+++ b/package/menu-cache/menu-cache.hash
@@ -0,0 +1,2 @@
+# From http://blog.lxde.org/?p=1299
+sha1 e7b3854109f9826472cf9795e924acebe5e27861 menu-cache-1.0.0.tar.xz
--git a/package/menu-cache/menu-cache.mk b/package/menu-cache/menu-cache.mk
new file mode 100644
index 0000000..a8ff21b
--- /dev/null
+++ b/package/menu-cache/menu-cache.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# menu-cache
+#
+################################################################################
+
+MENU_CACHE_VERSION_MAJOR = 1.0
+MENU_CACHE_VERSION_MINOR = 0
+MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).$(MENU_CACHE_VERSION_MINOR)
+MENU_CACHE_SOURCE = menu-cache-$(MENU_CACHE_VERSION).tar.xz
+MENU_CACHE_SITE = http://sourceforge.net/projects/lxde/files/menu-cache/$(MENU_CACHE_VERSION_MAJOR)
+MENU_CACHE_DEPENDENCIES = libfm-extra libglib2
+MENU_CACHE_LICENSE = LGPLv2.1
+MENU_CACHE_LICENSE_FILES = COPYING
+MENU_CACHE_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 2/4] menu-cache: new package
2014-11-21 15:33 ` [Buildroot] [PATCH v2 2/4] menu-cache: " Vicente Olivert Riera
@ 2014-12-10 21:05 ` Yann E. MORIN
2015-07-13 0:20 ` Thomas Petazzoni
1 sibling, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-12-10 21:05 UTC (permalink / raw)
To: buildroot
Vicente, All,
On 2014-11-21 15:33 +0000, Vicente Olivert Riera spake thusly:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[--SNIP--]
> diff --git a/package/menu-cache/menu-cache.hash b/package/menu-cache/menu-cache.hash
> new file mode 100644
> index 0000000..3b9e5c4
> --- /dev/null
> +++ b/package/menu-cache/menu-cache.hash
> @@ -0,0 +1,2 @@
> +# From http://blog.lxde.org/?p=1299
> +sha1 e7b3854109f9826472cf9795e924acebe5e27861 menu-cache-1.0.0.tar.xz
> diff --git a/package/menu-cache/menu-cache.mk b/package/menu-cache/menu-cache.mk
> new file mode 100644
> index 0000000..a8ff21b
> --- /dev/null
> +++ b/package/menu-cache/menu-cache.mk
> @@ -0,0 +1,17 @@
> +################################################################################
> +#
> +# menu-cache
> +#
> +################################################################################
> +
> +MENU_CACHE_VERSION_MAJOR = 1.0
> +MENU_CACHE_VERSION_MINOR = 0
Drop the _MINOR variable.
> +MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).$(MENU_CACHE_VERSION_MINOR)
MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).0
Regards,
Yann E. MORIN.
> +MENU_CACHE_SOURCE = menu-cache-$(MENU_CACHE_VERSION).tar.xz
> +MENU_CACHE_SITE = http://sourceforge.net/projects/lxde/files/menu-cache/$(MENU_CACHE_VERSION_MAJOR)
> +MENU_CACHE_DEPENDENCIES = libfm-extra libglib2
> +MENU_CACHE_LICENSE = LGPLv2.1
> +MENU_CACHE_LICENSE_FILES = COPYING
> +MENU_CACHE_INSTALL_STAGING = YES
> +
> +$(eval $(autotools-package))
> --
> 1.7.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 2/4] menu-cache: new package
2014-11-21 15:33 ` [Buildroot] [PATCH v2 2/4] menu-cache: " Vicente Olivert Riera
2014-12-10 21:05 ` Yann E. MORIN
@ 2015-07-13 0:20 ` Thomas Petazzoni
1 sibling, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2015-07-13 0:20 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Fri, 21 Nov 2014 15:33:08 +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> Changes v1 -> v2: Remove GETTEXT and LIBICONV lines. Copy/Paste error
Applied after some changes:
[Thomas:
- Remove the MENU_CACHE_VERSION_MINOR variable, not needed.
Noticed by Yann E. Morin.
- Rewrap Config.in help text.]
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 3/4] libfm: new package
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
2014-11-21 15:33 ` [Buildroot] [PATCH v2 2/4] menu-cache: " Vicente Olivert Riera
@ 2014-11-21 15:33 ` Vicente Olivert Riera
2014-12-10 21:18 ` Yann E. MORIN
2015-07-13 0:20 ` Thomas Petazzoni
2014-11-21 15:33 ` [Buildroot] [PATCH v2 4/4] pcmanfm: bump version to 1.2.3 Vicente Olivert Riera
` (4 subsequent siblings)
6 siblings, 2 replies; 19+ messages in thread
From: Vicente Olivert Riera @ 2014-11-21 15:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v1 -> v2: nothing
package/Config.in | 1 +
package/libfm/Config.in | 27 +++++++++++++++++++++++++++
package/libfm/libfm.hash | 2 ++
package/libfm/libfm.mk | 15 +++++++++++++++
4 files changed, 45 insertions(+), 0 deletions(-)
create mode 100644 package/libfm/Config.in
create mode 100644 package/libfm/libfm.hash
create mode 100644 package/libfm/libfm.mk
diff --git a/package/Config.in b/package/Config.in
index 56b71e4..fe9cd72 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -644,6 +644,7 @@ menu "Graphics"
source "package/libdmtx/Config.in"
source "package/libdrm/Config.in"
source "package/libexif/Config.in"
+ source "package/libfm/Config.in"
source "package/libfm-extra/Config.in"
source "package/libgail/Config.in"
source "package/libgeotiff/Config.in"
diff --git a/package/libfm/Config.in b/package/libfm/Config.in
new file mode 100644
index 0000000..51cdd4e
--- /dev/null
+++ b/package/libfm/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_LIBFM
+ bool "libfm"
+ select BR2_PACKAGE_MENU_CACHE
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBGTK2
+ select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_XORG7 # libgtk2
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+ depends on BR2_USE_MMU # libglib2
+ depends on BR2_INSTALL_LIBSTDCPP # libgtk2
+ depends on BR2_ARCH_HAS_ATOMICS # libgtk2
+ help
+ A glib/gio-based library providing some file management utilities and
+ related-widgets missing in gtk+/glib. This is the core of PCManFM.
+ The library is desktop independent (not LXDE specific) and has clean
+ API. It can be used to develop other applications requiring file
+ management functionality. For example, you can create your own file
+ manager with facilities provided by libfm.
+
+ http://wiki.lxde.org/en/Libfm
+
+comment "libfm needs a toolchain w/ wchar, threads, C++"
+ depends on BR2_USE_MMU
+ depends on BR2_ARCH_HAS_ATOMICS
+ depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+ !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libfm/libfm.hash b/package/libfm/libfm.hash
new file mode 100644
index 0000000..5311dec
--- /dev/null
+++ b/package/libfm/libfm.hash
@@ -0,0 +1,2 @@
+# From http://blog.lxde.org/?p=1280
+sha1 c3f2f34086761d89d6aba549883610084ba00750 libfm-1.2.3.tar.xz
diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
new file mode 100644
index 0000000..b498a5d
--- /dev/null
+++ b/package/libfm/libfm.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libfm
+#
+################################################################################
+
+LIBFM_VERSION = 1.2.3
+LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
+LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
+LIBFM_DEPENDENCIES = menu-cache libgtk2 libglib2 cairo
+LIBFM_LICENSE = GPLv2
+LIBFM_LICENSE_FILES = COPYING
+LIBFM_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 3/4] libfm: new package
2014-11-21 15:33 ` [Buildroot] [PATCH v2 3/4] libfm: " Vicente Olivert Riera
@ 2014-12-10 21:18 ` Yann E. MORIN
2015-07-13 0:20 ` Thomas Petazzoni
1 sibling, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-12-10 21:18 UTC (permalink / raw)
To: buildroot
vicente, All,
On 2014-11-21 15:33 +0000, Vicente Olivert Riera spake thusly:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[--SNIP--]
> diff --git a/package/libfm/Config.in b/package/libfm/Config.in
> new file mode 100644
> index 0000000..51cdd4e
> --- /dev/null
> +++ b/package/libfm/Config.in
> @@ -0,0 +1,27 @@
> +config BR2_PACKAGE_LIBFM
> + bool "libfm"
> + select BR2_PACKAGE_MENU_CACHE
> + select BR2_PACKAGE_LIBGLIB2
> + select BR2_PACKAGE_LIBGTK2
> + select BR2_PACKAGE_CAIRO
> + select BR2_PACKAGE_XORG7 # libgtk2
I know we said on IRC "The rule is that there is no rule" but I would
prefer this be a depends rather than a select.
We currently have no package that select Xorg, which would seem to mean
we do have an unwritten rule to not select Xorg. ;-)
> + depends on BR2_USE_WCHAR # libglib2
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> + depends on BR2_USE_MMU # libglib2
> + depends on BR2_INSTALL_LIBSTDCPP # libgtk2
> + depends on BR2_ARCH_HAS_ATOMICS # libgtk2
> + help
> + A glib/gio-based library providing some file management utilities and
> + related-widgets missing in gtk+/glib. This is the core of PCManFM.
> + The library is desktop independent (not LXDE specific) and has clean
> + API. It can be used to develop other applications requiring file
> + management functionality. For example, you can create your own file
> + manager with facilities provided by libfm.
> +
> + http://wiki.lxde.org/en/Libfm
> +
> +comment "libfm needs a toolchain w/ wchar, threads, C++"
> + depends on BR2_USE_MMU
> + depends on BR2_ARCH_HAS_ATOMICS
So:
comment "libfm needs X.Org and a toolchain w/ wchar, threads, C++"
and appropriate dependencies.
> + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
> + !BR2_TOOLCHAIN_HAS_THREADS
> diff --git a/package/libfm/libfm.hash b/package/libfm/libfm.hash
> new file mode 100644
> index 0000000..5311dec
> --- /dev/null
> +++ b/package/libfm/libfm.hash
> @@ -0,0 +1,2 @@
> +# From http://blog.lxde.org/?p=1280
> +sha1 c3f2f34086761d89d6aba549883610084ba00750 libfm-1.2.3.tar.xz
> diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
> new file mode 100644
> index 0000000..b498a5d
> --- /dev/null
> +++ b/package/libfm/libfm.mk
> @@ -0,0 +1,15 @@
> +################################################################################
> +#
> +# libfm
> +#
> +################################################################################
> +
> +LIBFM_VERSION = 1.2.3
> +LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
> +LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
> +LIBFM_DEPENDENCIES = menu-cache libgtk2 libglib2 cairo
> +LIBFM_LICENSE = GPLv2
Same comment as for libfm-extra (since it's the same package): it is
also partly LGPLV2.1+.
> +LIBFM_LICENSE_FILES = COPYING
But then, I don't see any extra file we could add in there... :-/
Maybe the same as for libfm-extra? Or just src/fm.h ?
Regards,
Yann E. MORIN.
> +LIBFM_INSTALL_STAGING = YES
> +
> +$(eval $(autotools-package))
> --
> 1.7.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 3/4] libfm: new package
2014-11-21 15:33 ` [Buildroot] [PATCH v2 3/4] libfm: " Vicente Olivert Riera
2014-12-10 21:18 ` Yann E. MORIN
@ 2015-07-13 0:20 ` Thomas Petazzoni
1 sibling, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2015-07-13 0:20 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Fri, 21 Nov 2014 15:33:09 +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> Changes v1 -> v2: nothing
Applied after some changes:
[Thomas:
- switch from 'select BR2_PACKAGE_XORG7' to 'depends on
BR2_PACKAGE_XORG7' as suggested by Yann E. Morin.
- add LGPLv2.1+ in the list of licenses as well as a corresponding
license file, as suggested by Yann E. Morin.]
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 4/4] pcmanfm: bump version to 1.2.3
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
2014-11-21 15:33 ` [Buildroot] [PATCH v2 2/4] menu-cache: " Vicente Olivert Riera
2014-11-21 15:33 ` [Buildroot] [PATCH v2 3/4] libfm: " Vicente Olivert Riera
@ 2014-11-21 15:33 ` Vicente Olivert Riera
2015-07-13 0:20 ` Thomas Petazzoni
2014-11-22 18:39 ` [Buildroot] [PATCH v2 1/4] libfm-extra: new package Thomas Petazzoni
` (3 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Vicente Olivert Riera @ 2014-11-21 15:33 UTC (permalink / raw)
To: buildroot
- Bump version to 1.2.3
- Remove unnecessary patch
- Add a hash file
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v1 -> v2: nothing
package/pcmanfm/Config.in | 32 +++++++++++---------
package/pcmanfm/pcmanfm-link-against-libx11.patch | 20 -------------
package/pcmanfm/pcmanfm.hash | 2 +
package/pcmanfm/pcmanfm.mk | 11 +++----
4 files changed, 25 insertions(+), 40 deletions(-)
delete mode 100644 package/pcmanfm/pcmanfm-link-against-libx11.patch
create mode 100644 package/pcmanfm/pcmanfm.hash
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index b3baa4c..6a9f68c 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -1,20 +1,24 @@
config BR2_PACKAGE_PCMANFM
bool "pcmanfm"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR # glib2
- depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
- depends on BR2_USE_MMU # glib2
- select BR2_PACKAGE_GAMIN
- select BR2_PACKAGE_STARTUP_NOTIFICATION
- select BR2_PACKAGE_XLIB_LIBX11
- depends on BR2_PACKAGE_LIBGTK2
+ select BR2_PACKAGE_LIBFM
+ select BR2_PACKAGE_MENU_CACHE
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBGTK2
+ select BR2_PACKAGE_XORG7 # libgtk2
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+ depends on BR2_USE_MMU # libglib2
+ depends on BR2_INSTALL_LIBSTDCPP # libgtk2
+ depends on BR2_ARCH_HAS_ATOMICS # libgtk2
help
- An extremely fast and lightweight file manager which features
- tabbed browsing and a user-friendly interface.
+ PCMan File Manager (PCManFM) is a file manager application developed
+ by Hong Jen Yee from Taiwan which is meant to be a replacement for
+ Nautilus, Konqueror and Thunar.
- http://internap.dl.sourceforge.net/sourceforge/pcmanfm
+ http://wiki.lxde.org/en/PCManFM
-comment "pcmanfm needs a toolchain w/ wchar, threads"
- depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+comment "pcmanfm needs a toolchain w/ wchar, threads, C++"
depends on BR2_USE_MMU
+ depends on BR2_ARCH_HAS_ATOMICS
+ depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+ !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/pcmanfm/pcmanfm-link-against-libx11.patch b/package/pcmanfm/pcmanfm-link-against-libx11.patch
deleted file mode 100644
index f571e77..0000000
--- a/package/pcmanfm/pcmanfm-link-against-libx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.hash b/package/pcmanfm/pcmanfm.hash
new file mode 100644
index 0000000..a3b7653
--- /dev/null
+++ b/package/pcmanfm/pcmanfm.hash
@@ -0,0 +1,2 @@
+# From http://blog.lxde.org/?p=1280
+sha1 0a195301de31c82f1c169e620be7cea8b91813b5 pcmanfm-1.2.3.tar.xz
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index d372e51..0447095 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -4,12 +4,11 @@
#
################################################################################
-PCMANFM_VERSION = 0.3.5.9
-PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
-PCMANFM_CONF_OPTS = --disable-hal
-PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX11
-PCMANFM_AUTORECONF = YES
-PCMANFM_LICENSE = GPLv2+
+PCMANFM_VERSION = 1.2.3
+PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
+PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
+PCMANFM_DEPENDENCIES = libgtk2 libglib2 menu-cache libfm
+PCMANFM_LICENSE = GPLv2
PCMANFM_LICENSE_FILES = COPYING
$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
` (2 preceding siblings ...)
2014-11-21 15:33 ` [Buildroot] [PATCH v2 4/4] pcmanfm: bump version to 1.2.3 Vicente Olivert Riera
@ 2014-11-22 18:39 ` Thomas Petazzoni
2014-11-24 10:10 ` Vicente Olivert Riera
2014-12-10 20:57 ` Yann E. MORIN
` (2 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni @ 2014-11-22 18:39 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Fri, 21 Nov 2014 15:33:07 +0000, Vicente Olivert Riera wrote:
> +LIBFM_EXTRA_VERSION = 1.2.3
> +LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
This is the exact same tarball as the one used for the libfm package:
+LIBFM_VERSION = 1.2.3
+LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
+LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
Why do we have two different packages? Is it because libfm full version
needs menu-cache, and menu-cache needs libfm-extra? This really seems
weird.
Can you elaborate on this?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-22 18:39 ` [Buildroot] [PATCH v2 1/4] libfm-extra: new package Thomas Petazzoni
@ 2014-11-24 10:10 ` Vicente Olivert Riera
2014-11-24 19:33 ` Thomas Petazzoni
0 siblings, 1 reply; 19+ messages in thread
From: Vicente Olivert Riera @ 2014-11-24 10:10 UTC (permalink / raw)
To: buildroot
Dear Thomas Petazzoni,
On 11/22/2014 06:39 PM, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
>
> On Fri, 21 Nov 2014 15:33:07 +0000, Vicente Olivert Riera wrote:
>
>> +LIBFM_EXTRA_VERSION = 1.2.3
>> +LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
>
> This is the exact same tarball as the one used for the libfm package:
>
> +LIBFM_VERSION = 1.2.3
> +LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
> +LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
>
> Why do we have two different packages? Is it because libfm full version
> needs menu-cache, and menu-cache needs libfm-extra?
Yes, that is exactly the reason. Look for instance how is done in
LinuxFromScratch:
http://www.linuxfromscratch.org/blfs/view/svn/lxde/libfm-extra.html
They build libfm-extra first, then menu-cache and then libfm. I did
exactly the same.
Cheers,
--
Vicente Olivert Riera
Graduate Software Engineer, MIPS Processor IP
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-24 10:10 ` Vicente Olivert Riera
@ 2014-11-24 19:33 ` Thomas Petazzoni
2014-11-25 9:52 ` Vicente Olivert Riera
0 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni @ 2014-11-24 19:33 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Mon, 24 Nov 2014 10:10:50 +0000, Vicente Olivert Riera wrote:
> On 11/22/2014 06:39 PM, Thomas Petazzoni wrote:
> > Dear Vicente Olivert Riera,
> >
> > On Fri, 21 Nov 2014 15:33:07 +0000, Vicente Olivert Riera wrote:
> >
> >> +LIBFM_EXTRA_VERSION = 1.2.3
> >> +LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
> >
> > This is the exact same tarball as the one used for the libfm package:
> >
> > +LIBFM_VERSION = 1.2.3
> > +LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
> > +LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
> >
> > Why do we have two different packages? Is it because libfm full version
> > needs menu-cache, and menu-cache needs libfm-extra?
>
> Yes, that is exactly the reason. Look for instance how is done in
> LinuxFromScratch:
>
> http://www.linuxfromscratch.org/blfs/view/svn/lxde/libfm-extra.html
>
> They build libfm-extra first, then menu-cache and then libfm. I did
> exactly the same.
And you didn't explain that anywhere in the commit logs? No comments
about this in the code? If you want such non-obvious stuff to be merged
one day, you should at least add a little bit of explanation about it.
This all seems a bit crazy. How are the pcmanfm people building their
stuff?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-24 19:33 ` Thomas Petazzoni
@ 2014-11-25 9:52 ` Vicente Olivert Riera
0 siblings, 0 replies; 19+ messages in thread
From: Vicente Olivert Riera @ 2014-11-25 9:52 UTC (permalink / raw)
To: buildroot
Dear Thomas Petazzoni,
On 11/24/2014 07:33 PM, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
>
> On Mon, 24 Nov 2014 10:10:50 +0000, Vicente Olivert Riera wrote:
>
>> On 11/22/2014 06:39 PM, Thomas Petazzoni wrote:
>>> Dear Vicente Olivert Riera,
>>>
>>> On Fri, 21 Nov 2014 15:33:07 +0000, Vicente Olivert Riera wrote:
>>>
>>>> +LIBFM_EXTRA_VERSION = 1.2.3
>>>> +LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
>>>
>>> This is the exact same tarball as the one used for the libfm package:
>>>
>>> +LIBFM_VERSION = 1.2.3
>>> +LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
>>> +LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
>>>
>>> Why do we have two different packages? Is it because libfm full version
>>> needs menu-cache, and menu-cache needs libfm-extra?
>>
>> Yes, that is exactly the reason. Look for instance how is done in
>> LinuxFromScratch:
>>
>> http://www.linuxfromscratch.org/blfs/view/svn/lxde/libfm-extra.html
>>
>> They build libfm-extra first, then menu-cache and then libfm. I did
>> exactly the same.
>
> And you didn't explain that anywhere in the commit logs? No comments
> about this in the code? If you want such non-obvious stuff to be merged
> one day, you should at least add a little bit of explanation about it.
If you want, I don't mind to respin my patches adding more information
about that. But please, don't say that there is zero information because
in the "help" message of the libfm-extra package I added a short text
saying that package is needed for menu-cache:
+ help
+ The libfm-extra package contains a library and other files
+ required by menu-cache-gen libexec of menu-cache-1.0.0
And also in the cover-letter:
http://lists.busybox.net/pipermail/buildroot/2014-November/112652.html
> This all seems a bit crazy. How are the pcmanfm people building their
> stuff?
They are building it in that way. First libfm-extra, then menu-cache,
then libfm and finally pcmanfm.
Cheers,
--
Vicente Olivert Riera
Graduate Software Engineer, MIPS Processor IP
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
` (3 preceding siblings ...)
2014-11-22 18:39 ` [Buildroot] [PATCH v2 1/4] libfm-extra: new package Thomas Petazzoni
@ 2014-12-10 20:57 ` Yann E. MORIN
2014-12-10 21:10 ` Thomas Petazzoni
2014-12-10 21:03 ` Yann E. MORIN
2015-07-13 0:19 ` Thomas Petazzoni
6 siblings, 1 reply; 19+ messages in thread
From: Yann E. MORIN @ 2014-12-10 20:57 UTC (permalink / raw)
To: buildroot
Vincet, All,
On 2014-11-21 15:33 +0000, Vicente Olivert Riera spake thusly:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[--SNIP--]
> diff --git a/package/libfm-extra/libfm-extra.mk b/package/libfm-extra/libfm-extra.mk
> new file mode 100644
> index 0000000..70e37b9
> --- /dev/null
> +++ b/package/libfm-extra/libfm-extra.mk
> @@ -0,0 +1,16 @@
> +################################################################################
> +#
> +# libfm-extra
> +#
> +################################################################################
> +
> +LIBFM_EXTRA_VERSION = 1.2.3
> +LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
> +LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files
> +LIBFM_EXTRA_DEPENDENCIES = libglib2
> +LIBFM_EXTRA_LICENSE = GPLv2
Dome files have the LGPLV2.1+ header, like:
src/fm.c
src/fm-extra.h
src/base/fm-app-info.c
[...]
Also, the only file that seem to get compiled is:
src/extra/fm-xml-file.c
for which the header states it is LGPLv2.1+.
So, even if there's only the COPYING for the GPLv2 and that we only
compile an LGPLv2.1+ file, I'd state both licenses.
> +LIBFM_EXTRA_LICENSE_FILES = COPYING
Here, I'd add src/extra/fm-xml-file.c as a license file, too.
Regards,
Yann E. MORIN.
> +LIBFM_EXTRA_INSTALL_STAGING = YES
> +LIBFM_EXTRA_CONF_OPTS = --with-extra-only --with-gtk=no
> +
> +$(eval $(autotools-package))
> --
> 1.7.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-12-10 20:57 ` Yann E. MORIN
@ 2014-12-10 21:10 ` Thomas Petazzoni
2014-12-10 21:28 ` Yann E. MORIN
0 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni @ 2014-12-10 21:10 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 10 Dec 2014 21:57:15 +0100, Yann E. MORIN wrote:
> Also, the only file that seem to get compiled is:
> src/extra/fm-xml-file.c
>
> for which the header states it is LGPLv2.1+.
>
> So, even if there's only the COPYING for the GPLv2 and that we only
> compile an LGPLv2.1+ file, I'd state both licenses.
I'm not sure here: since some files of the library are under the GPL,
the library as a whole is under the GPL, even though some parts of it
are under other licenses.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-12-10 21:10 ` Thomas Petazzoni
@ 2014-12-10 21:28 ` Yann E. MORIN
2014-12-10 21:31 ` Thomas Petazzoni
0 siblings, 1 reply; 19+ messages in thread
From: Yann E. MORIN @ 2014-12-10 21:28 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-12-10 22:10 +0100, Thomas Petazzoni spake thusly:
> On Wed, 10 Dec 2014 21:57:15 +0100, Yann E. MORIN wrote:
>
> > Also, the only file that seem to get compiled is:
> > src/extra/fm-xml-file.c
> >
> > for which the header states it is LGPLv2.1+.
> >
> > So, even if there's only the COPYING for the GPLv2 and that we only
> > compile an LGPLv2.1+ file, I'd state both licenses.
>
> I'm not sure here: since some files of the library are under the GPL,
> the library as a whole is under the GPL, even though some parts of it
> are under other licenses.
Yes, the GPL gobbles up the LGPL, because of its stronger requirements.
But licensing wise, they are both applicable licenses.
Even worse in this case, the resulting combination is probably just
LGPLv2.1+, since the only compiled file is LGPLv2.1+.
So, I'd prefer we stride on the safe side, and include both licenses,
and delegate to the user (and/or his legal team) the decision as to what
license is applicable.
We are not lawyer, and this is a complicated matter.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-12-10 21:28 ` Yann E. MORIN
@ 2014-12-10 21:31 ` Thomas Petazzoni
0 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2014-12-10 21:31 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 10 Dec 2014 22:28:21 +0100, Yann E. MORIN wrote:
> Yes, the GPL gobbles up the LGPL, because of its stronger requirements.
> But licensing wise, they are both applicable licenses.
>
> Even worse in this case, the resulting combination is probably just
> LGPLv2.1+, since the only compiled file is LGPLv2.1+.
Ah, indeed if the only compiled files are LGPLv2.1+, then the
<pkg>_LICENSE should state that, because it's quite important. Usually
something like LGPLv2.1+ (library), GPLv2+ (<some other stuff>).
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
` (4 preceding siblings ...)
2014-12-10 20:57 ` Yann E. MORIN
@ 2014-12-10 21:03 ` Yann E. MORIN
2015-07-13 0:19 ` Thomas Petazzoni
6 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-12-10 21:03 UTC (permalink / raw)
To: buildroot
Vicente, All,
Some further review I previously missed...
On 2014-11-21 15:33 +0000, Vicente Olivert Riera spake thusly:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[--SNIP--]
> diff --git a/package/libfm-extra/Config.in b/package/libfm-extra/Config.in
> new file mode 100644
> index 0000000..f0e0b63
> --- /dev/null
> +++ b/package/libfm-extra/Config.in
> @@ -0,0 +1,15 @@
> +config BR2_PACKAGE_LIBFM_EXTRA
> + bool "libfm-extra"
> + select BR2_PACKAGE_LIBGLIB2
> + depends on BR2_USE_WCHAR # libglib2
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> + depends on BR2_USE_MMU # libglib2
> + help
> + The libfm-extra package contains a library and other files
> + required by menu-cache-gen libexec of menu-cache-1.0.0
> +
> + http://wiki.lxde.org/en/Libfm
> +
> +comment "libfm-extra needs a toolchain w/ wchar, threads, C++"
"C++" is not needed. Stray copy-paste? ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 1/4] libfm-extra: new package
2014-11-21 15:33 [Buildroot] [PATCH v2 1/4] libfm-extra: new package Vicente Olivert Riera
` (5 preceding siblings ...)
2014-12-10 21:03 ` Yann E. MORIN
@ 2015-07-13 0:19 ` Thomas Petazzoni
6 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2015-07-13 0:19 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Fri, 21 Nov 2014 15:33:07 +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> Changes v1 -> v2: nothing
Applied after some changes:
[Thomas:
- adjust license: it's actually under GPLv2+, plus some bits under
LGPLv2.1+ as noticed by Yann E. Morin, and add another license
file for LGPLv2.1+
- add missing dependency on host-intltool.]
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread