From ebf4ff0d925a20d27a6e74f9057b7d621988d825 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 15:34:07 +0200 Subject: [PATCH 01/21] Revert "gvfs: Remove version 1.24.0 replaced by gio from GLib" This reverts commit 2d9b063724069696cf2fa288331585e87cb50895. Gvfs is still needed. Only the tools were moved to GLib. http://www.linuxfromscratch.org/blfs/view/9.0/gnome/gvfs.html --- gvfs.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 gvfs.be0 diff --git a/gvfs.be0 b/gvfs.be0 new file mode 100755 index 000000000..9d0efba62 --- /dev/null +++ b/gvfs.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gvfs-1.24.0-3 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="ftp://ftp.gnome.org/pub/gnome/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVERSION}.tar.xz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be build +## outside the source directory and need to be build inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0]="" is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From da81d2ac08365ec7cdebffe4191d8935d6917444 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 15:43:07 +0200 Subject: [PATCH 02/21] gsettings-desktop-schemas: Strip trailing space --- gsettings-desktop-schemas-3.4.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsettings-desktop-schemas-3.4.1-0.bee b/gsettings-desktop-schemas-3.4.1-0.bee index 37bf9707a..44ebce52e 100755 --- a/gsettings-desktop-schemas-3.4.1-0.bee +++ b/gsettings-desktop-schemas-3.4.1-0.bee @@ -25,7 +25,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 07f90a18d8b8fd9dc7fec474fa6f127f7341441d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 15:45:06 +0200 Subject: [PATCH 03/21] gsettings-desktop-schemas: Securely download source archive with HTTPS --- gsettings-desktop-schemas-3.4.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsettings-desktop-schemas-3.4.1-0.bee b/gsettings-desktop-schemas-3.4.1-0.bee index 44ebce52e..13cb5d603 100755 --- a/gsettings-desktop-schemas-3.4.1-0.bee +++ b/gsettings-desktop-schemas-3.4.1-0.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="ftp://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/${PKGVERSION[2]}/gsettings-desktop-schemas-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.gnome.org/sources/gsettings-desktop-schemas/${PKGVERSION[2]}/gsettings-desktop-schemas-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 4210e769f2fe984275d94e16a87a61f4ac94cec0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 15:45:38 +0200 Subject: [PATCH 04/21] gsettings-desktop-schemas: Convert to versionless bee file --- ...desktop-schemas-3.4.1-0.bee => gsettings-desktop-schemas.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gsettings-desktop-schemas-3.4.1-0.bee => gsettings-desktop-schemas.be0 (90%) diff --git a/gsettings-desktop-schemas-3.4.1-0.bee b/gsettings-desktop-schemas.be0 similarity index 90% rename from gsettings-desktop-schemas-3.4.1-0.bee rename to gsettings-desktop-schemas.be0 index 13cb5d603..8fc45f563 100755 --- a/gsettings-desktop-schemas-3.4.1-0.bee +++ b/gsettings-desktop-schemas.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION gsettings-desktop-schemas-3.4.1-0 + SRCURL[0]="https://download.gnome.org/sources/gsettings-desktop-schemas/${PKGVERSION[2]}/gsettings-desktop-schemas-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 08095782c484010faf6b2c7ce7af64bb59f2d0e2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:01:19 +0200 Subject: [PATCH 05/21] gsettings-desktop-schemas: Use current minimal bee file template --- gsettings-desktop-schemas.be0 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gsettings-desktop-schemas.be0 b/gsettings-desktop-schemas.be0 index 8fc45f563..f64c874d7 100755 --- a/gsettings-desktop-schemas.be0 +++ b/gsettings-desktop-schemas.be0 @@ -4,19 +4,11 @@ SRCURL[0]="https://download.gnome.org/sources/gsettings-desktop-schemas/${PKGVERSION[2]}/gsettings-desktop-schemas-${PKGVERSION}.tar.xz" -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# BEE_BUILDTYPE= - -# EXCLUDE="" +# PATCHURL+=() # build_in_sourcedir - - - +# sourcesubdir_append src #mee_extract() { # bee_extract "${@}" @@ -37,3 +29,7 @@ PATCHURL[0]="" #mee_install() { # bee_install #} + +#mee_install_post() { +# exit +#} From db3c16d0a215993c7f0a5a57e184a69a46fdb567 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:33:36 +0200 Subject: [PATCH 06/21] libmtp: Strip trailing space --- libmtp-1.1.8-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmtp-1.1.8-0.bee b/libmtp-1.1.8-0.bee index 25b8bc146..5f7babaff 100755 --- a/libmtp-1.1.8-0.bee +++ b/libmtp-1.1.8-0.bee @@ -43,7 +43,7 @@ SRCURL[0]="http://downloads.sourceforge.net/project/libmtp/libmtp/${PKGVERSION}/ #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From a132d523c71355b7cbeb3aeb5b82e7981338e684 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:34:16 +0200 Subject: [PATCH 07/21] libmtp: Use current bee file template --- libmtp-1.1.8-0.bee | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libmtp-1.1.8-0.bee b/libmtp-1.1.8-0.bee index 5f7babaff..faba4c39d 100755 --- a/libmtp-1.1.8-0.bee +++ b/libmtp-1.1.8-0.bee @@ -16,17 +16,20 @@ SRCURL[0]="http://downloads.sourceforge.net/project/libmtp/libmtp/${PKGVERSION}/ # PATCHURL+=() ############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. -# EXCLUDE+=() +# build_in_sourcedir ############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src -# build_in_sourcedir ############################################################################### ## Change the default (auto-detected) steps to @@ -62,7 +65,7 @@ SRCURL[0]="http://downloads.sourceforge.net/project/libmtp/libmtp/${PKGVERSION}/ ## The name of this bee-file should follow the following naming convention: ## pkgname-pkgversion-pkgrevision.bee ## -## You may remove all comments as long as SRCURL[0]="" is set. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## From 0b38643fec5185d8e4985644173c53045e9801f2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:35:04 +0200 Subject: [PATCH 08/21] libmtp: Convert to versionless bee file --- libmtp-1.1.8-0.bee => libmtp.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libmtp-1.1.8-0.bee => libmtp.be0 (98%) diff --git a/libmtp-1.1.8-0.bee b/libmtp.be0 similarity index 98% rename from libmtp-1.1.8-0.bee rename to libmtp.be0 index faba4c39d..fe146b108 100755 --- a/libmtp-1.1.8-0.bee +++ b/libmtp.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libmtp-1.1.8-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 9c6e0462a6d70d2d0f415650a2fb067bd6a20b90 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:35:21 +0200 Subject: [PATCH 09/21] libmtp: Securely download source archive with HTTPS --- libmtp.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmtp.be0 b/libmtp.be0 index fe146b108..d52d25f73 100755 --- a/libmtp.be0 +++ b/libmtp.be0 @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://downloads.sourceforge.net/project/libmtp/libmtp/${PKGVERSION}/libmtp-${PKGVERSION}.tar.gz" +SRCURL[0]="https://downloads.sourceforge.net/project/libmtp/libmtp/${PKGVERSION}/libmtp-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 91d139f6ee5588943b38af99e66d81f790a027bd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:36:09 +0200 Subject: [PATCH 10/21] libmtp: Update version from 1.1.8 to 1.1.16 Add the latest version for Gvfs 1.42.0. Run-time dependency libmtp found: NO (tried cmake) meson.build:441:2: ERROR: Invalid version of dependency, need 'libmtp' ['>= 1.1.12'] found '1.1.8'. --- libmtp.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmtp.be0 b/libmtp.be0 index d52d25f73..95b87eddf 100755 --- a/libmtp.be0 +++ b/libmtp.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libmtp-1.1.8-0 +# BEE_VERSION libmtp-1.1.16-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 91dedd5a4e258ffc29ab0f861013f6826e81ba3a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:37:41 +0200 Subject: [PATCH 11/21] libmtp: Do not build static version of library --- libmtp.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libmtp.be0 b/libmtp.be0 index 95b87eddf..a1852c962 100755 --- a/libmtp.be0 +++ b/libmtp.be0 @@ -47,9 +47,10 @@ SRCURL[0]="https://downloads.sourceforge.net/project/libmtp/libmtp/${PKGVERSION} # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From 328e879e37b353ff908f0cb70e471f575a521ac5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 15:35:00 +0200 Subject: [PATCH 12/21] gvfs: Update version from 1.24.0 to 1.42.0 --- gvfs.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvfs.be0 b/gvfs.be0 index 9d0efba62..3d6d05f24 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gvfs-1.24.0-3 +# BEE_VERSION gvfs-1.42.0-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 016c880243340a12a67d00c5157091d22ed56e8d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:20:32 +0200 Subject: [PATCH 13/21] gvfs: Securely download source archive with HTTPS --- gvfs.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvfs.be0 b/gvfs.be0 index 3d6d05f24..5d33c3878 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="ftp://ftp.gnome.org/pub/gnome/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.gnome.org/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From e8ae8312bbfdb2e459af092ab3393dcf0d274ed3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:16:30 +0200 Subject: [PATCH 14/21] gvfs: Disable DNS-SD backend Work around the configure failure below. Run-time dependency avahi-client found: NO (tried pkgconfig and cmake) meson.build:319:2: ERROR: Dependency "avahi-client" not found, tried pkgconfig and cmake --- gvfs.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gvfs.be0 b/gvfs.be0 index 5d33c3878..8f38a9ec0 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -53,9 +53,10 @@ SRCURL[0]="https://download.gnome.org/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVE # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + -Ddnssd=false +} #mee_build() { # bee_build From 92b2ef9ce7bb2053ed5607ffc4800e837a203e4f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:22:45 +0200 Subject: [PATCH 15/21] gvfs: Disable FUSE Work around the configure error below. Run-time dependency fuse3 found: NO (tried pkgconfig and cmake) meson.build:334:2: ERROR: Dependency "fuse3" not found, tried pkgconfig and cmake --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index 8f38a9ec0..2988dfb0e 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -55,6 +55,7 @@ SRCURL[0]="https://download.gnome.org/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVE mee_configure() { bee_configure \ + -Dfuse=false \ -Ddnssd=false } From dcee47036280fd5558c3a1c11c10d847e35d8fb0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:24:30 +0200 Subject: [PATCH 16/21] gvfs: Disable AFC backend Work around the configure error below. Run-time dependency libimobiledevice-1.0 found: NO (tried pkgconfig and cmake) meson.build:360:2: ERROR: Dependency "libimobiledevice-1.0" not found, tried pkgconfig and cmake --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index 2988dfb0e..4208b4942 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -55,6 +55,7 @@ SRCURL[0]="https://download.gnome.org/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVE mee_configure() { bee_configure \ + -Dafc=false \ -Dfuse=false \ -Ddnssd=false } From 3c48304af50700085481a012309132fa3c5c4d57 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:25:33 +0200 Subject: [PATCH 17/21] gvfs: Disable Gnome Online Account (GOA) volume monitor Work around the configure error below. Run-time dependency goa-1.0 found: NO (tried pkgconfig and cmake) meson.build:367:2: ERROR: Dependency "goa-1.0" not found, tried pkgconfig and cmake --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index 4208b4942..7199ba5d4 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -57,6 +57,7 @@ mee_configure() { bee_configure \ -Dafc=false \ -Dfuse=false \ + -Dgoa=false \ -Ddnssd=false } From c8b57a9d8834dceab2063f9ca99fb5c9a70a18d4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:30:10 +0200 Subject: [PATCH 18/21] gvfs: Disable SMB Work around the configure error below. Run-time dependency smbclient found: NO (tried pkgconfig and cmake) meson.build:394:2: ERROR: Dependency "smbclient" not found, tried pkgconfig and cmake --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index 7199ba5d4..c9fe6c5aa 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -58,6 +58,7 @@ mee_configure() { -Dafc=false \ -Dfuse=false \ -Dgoa=false \ + -Dsmb=false \ -Ddnssd=false } From 3aecd29c0cc45fec1f9da3ccd7d3340f6af0ca70 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:31:12 +0200 Subject: [PATCH 19/21] gvfs: Disable CDDA backend Run-time dependency libcdio_paranoia found: NO (tried pkgconfig and cmake) meson.build:410:2: ERROR: Dependency "libcdio_paranoia" not found, tried pkgconfig and cmake --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index c9fe6c5aa..9975fb6df 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -56,6 +56,7 @@ SRCURL[0]="https://download.gnome.org/sources/gvfs/${PKGVERSION[2]}/gvfs-${PKGVE mee_configure() { bee_configure \ -Dafc=false \ + -Dcdda=false \ -Dfuse=false \ -Dgoa=false \ -Dsmb=false \ From d178077b63c8c9cff84c34d949b76f29225f6e9d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:32:19 +0200 Subject: [PATCH 20/21] gvfs: Disable Google backend Work around the configure error below. meson.build:417:2: ERROR: Assert failed: Google backend requested but GOA is required --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index 9975fb6df..039717ccc 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -59,6 +59,7 @@ mee_configure() { -Dcdda=false \ -Dfuse=false \ -Dgoa=false \ + -Dgoogle=false \ -Dsmb=false \ -Ddnssd=false } From e4da4674541bfb1eceedd6d9c129128001aadc75 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 30 Sep 2019 17:40:03 +0200 Subject: [PATCH 21/21] gvfs: Disable NFS backend Run-time dependency libnfs found: NO (tried pkgconfig and cmake) meson.build:454:2: ERROR: Dependency "libnfs" not found, tried pkgconfig and cmake --- gvfs.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gvfs.be0 b/gvfs.be0 index 039717ccc..5f60a2a7e 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -60,6 +60,7 @@ mee_configure() { -Dfuse=false \ -Dgoa=false \ -Dgoogle=false \ + -Dnfs=false \ -Dsmb=false \ -Ddnssd=false }