From 9bccf6b6d508d6330744af85a56c8f91d7421768 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:51:50 +0100 Subject: [PATCH 01/30] wayland: Add version 1.14.0 From [1]: > Wayland is a project to define a protocol for a compositor to talk to > its clients as well as a library implementation of the protocol. Create the versionless bee file with the commands below. ``` $ bee init https://wayland.freedesktop.org/releases/wayland-1.14.0.tar.xz creating wayland-1.14.0-0.bee from template '/etc/default/bee/templates/fallback' $ mv wayland-1.14.0-0.bee wayland.be0 $ vim wayland.be0 $ git add $_ ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/wayland.html --- wayland.be0 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 wayland.be0 diff --git a/wayland.be0 b/wayland.be0 new file mode 100755 index 000000000..4a741bb22 --- /dev/null +++ b/wayland.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION wayland-1.14.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.) + +############################################################################### +## 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]="https://wayland.freedesktop.org/releases/wayland-${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 built +## outside the source directory and needs to be built 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 432df23a7da82c8666a6e411b3ef932bc9024ca6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:44:14 +0100 Subject: [PATCH 02/30] wayland: Prevent installation of static versions of libraries --- wayland.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wayland.be0 b/wayland.be0 index 4a741bb22..f6d75a8de 100755 --- a/wayland.be0 +++ b/wayland.be0 @@ -53,9 +53,10 @@ SRCURL[0]="https://wayland.freedesktop.org/releases/wayland-${PKGVERSION}.tar.xz # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From 0d666ddb0a35f7676eea97cc4f701044f8c471c3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:55:59 +0100 Subject: [PATCH 03/30] wayland-protocols: Add version 1.12 From [1]: > The Wayland-Protocols package contains additional Wayland protocols > that add functionality outside of protocols already in the Wayland > core. Create the versionless bee file with the commands below. ``` $ bee init https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz creating wayland-protocols-1.12-0.bee from template '/etc/default/bee/templates/fallback' $ mv wayland-protocols-1.12-0.bee wayland-protocols.be0 $ git add $_ $ vim $_ $ git commit -a ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/wayland-protocols.html --- wayland-protocols.be0 | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 wayland-protocols.be0 diff --git a/wayland-protocols.be0 b/wayland-protocols.be0 new file mode 100755 index 000000000..4bf6692f0 --- /dev/null +++ b/wayland-protocols.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION wayland-protocols-1.12-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.) + +############################################################################### +## 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]="https://wayland.freedesktop.org/releases/wayland-protocols-${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 built +## outside the source directory and needs to be built 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 07041e50a58a5f43ebfb950c4613ef00d82d582c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:51:29 +0100 Subject: [PATCH 04/30] mesalib: Correct configure switch `--with-platforms` Fixes: 08b94dfb (mesalib: Replace deprecated switch name) --- mesalib.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesalib.be0 b/mesalib.be0 index b11e717c4..e6d99a047 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mesalib-17.2.4-0 +# BEE_VERSION mesalib-17.2.6-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.) @@ -62,7 +62,7 @@ mee_configure() { --enable-xa \ --enable-glx-tls \ --with-llvm-shared-libs \ - --with--platforms="drm,x11" \ + --with-platforms="drm,x11" \ --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ --with-vulkan-drivers="intel,radeon" } From 7d82da98309e7ca97f562214d5c04d195d01c84e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:52:19 +0100 Subject: [PATCH 05/30] mesalib: Enable Wayland backend --- mesalib.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesalib.be0 b/mesalib.be0 index e6d99a047..afb5a0977 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -62,7 +62,7 @@ mee_configure() { --enable-xa \ --enable-glx-tls \ --with-llvm-shared-libs \ - --with-platforms="drm,x11" \ + --with-platforms="drm,x11,wayland" \ --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ --with-vulkan-drivers="intel,radeon" } From ae81f7384e050f95929a2b947d45bb1bf86cd658 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 17:22:45 +0100 Subject: [PATCH 06/30] mesalib: Remove deprecated configure option --- mesalib.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/mesalib.be0 b/mesalib.be0 index afb5a0977..4650aa94c 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -61,7 +61,6 @@ mee_configure() { --enable-osmesa \ --enable-xa \ --enable-glx-tls \ - --with-llvm-shared-libs \ --with-platforms="drm,x11,wayland" \ --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ --with-vulkan-drivers="intel,radeon" From dbf2ca28537b9784a23bb40e5c90ce56e64cadb1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:21:03 +0100 Subject: [PATCH 07/30] glib2: Convert to versionless bee file --- glib2-2.44.1-0.bee => glib2.be0 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename glib2-2.44.1-0.bee => glib2.be0 (100%) diff --git a/glib2-2.44.1-0.bee b/glib2.be0 similarity index 100% rename from glib2-2.44.1-0.bee rename to glib2.be0 From 93a181a9db14169a92ff75072bfb9101f95698bb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:22:24 +0100 Subject: [PATCH 08/30] glib2: Update version from 2.44.1 to 2.54.2 GTK+ 3.22.26 requires a newer GLIB version, so update it. Change-log is available online [1]. [1] https://git.gnome.org/browse/glib/tree/NEWS?h=glib-2-54 --- glib2.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glib2.be0 b/glib2.be0 index a2f34e009..82b629b5c 100755 --- a/glib2.be0 +++ b/glib2.be0 @@ -1,8 +1,10 @@ #!/usr/bin/env beesh +# BEE_VERSION glib2-2.54.2-0 + SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/glib/${PKGVERSION[2]}/glib-${PKGVERSION}.tar.xz" -PATCHURL+=(/src/mariux/download/mariux64-glib-2.44.0-0001-g_get_current_dir-use-get_current_dir_name-if-_GNU_S.patch) +# PATCHURL+=() # BEE_CONFIGURE=compat From b85d4c3b7de91ce94bd745cc73fb56970e13f526 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:29:47 +0100 Subject: [PATCH 09/30] libxkbcommon: Add version 0.7.2 From [1]: > libxkbcommon is a keymap compiler and support library which processes > a reduced subset of keymaps as defined by the XKB specification. Create the versionless bee file with the commands below. ``` $ bee init https://xkbcommon.org/download/libxkbcommon-0.7.2.tar.xz creating libxkbcommon-0.7.2-0.bee from template '/etc/default/bee/templates/fallback' $ mv libxkbcommon-0.7.2-0.bee libxkbcommon.be0 $ git add $_ $ vim $_ ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/libxkbcommon.html --- libxkbcommon.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 libxkbcommon.be0 diff --git a/libxkbcommon.be0 b/libxkbcommon.be0 new file mode 100755 index 000000000..a2045d7d9 --- /dev/null +++ b/libxkbcommon.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libxkbcommon-0.7.2-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.) + +############################################################################### +## 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]="https://xkbcommon.org/download/libxkbcommon-${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 built +## outside the source directory and needs to be built 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 25fe5e8c64f2f823d41660e58cf028be75df3a04 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 13:47:07 +0100 Subject: [PATCH 10/30] gtk3: Securely download source archive Use HTTPS to securely download the source archive. --- gtk3-3.16.6-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3-3.16.6-0.bee b/gtk3-3.16.6-0.bee index 145467991..82b543347 100755 --- a/gtk3-3.16.6-0.bee +++ b/gtk3-3.16.6-0.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 8409aacdce8cc308f614ca4d927379e8362832a8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 13:48:00 +0100 Subject: [PATCH 11/30] gtk3: Convert to versionless bee file --- gtk3-3.16.6-0.bee => gtk3.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gtk3-3.16.6-0.bee => gtk3.be0 (94%) diff --git a/gtk3-3.16.6-0.bee b/gtk3.be0 similarity index 94% rename from gtk3-3.16.6-0.bee rename to gtk3.be0 index 82b543347..d51864c73 100755 --- a/gtk3-3.16.6-0.bee +++ b/gtk3.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION gtk3-3.16.6-0 + SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 9bc6afa63e17bfdaa0af77112554e3bc124aa28f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:17:16 +0100 Subject: [PATCH 12/30] gtk3: Update version from 3.16.6 to 3.22.26 Update to GTK+ 3.22.26 fixing [\[Bug 114281\] AutoFilter drop-down menu items invisible] (https://bugs.documentfoundation.org/show_bug.cgi?id=114281) reported by Thomas R.. Announcement from September 2016 [1]: > What's new in 3.22 > ================== > > The 3.22 release is the last development release in the GTK+ 3. series. > GTK+ 3.22 will be maintained as the long-term stable version of GTK+ 3, > and new development will move to the GTK+ 3.90.x releases. To learn more > about the GTK+ roadmap, read: > > https://blog.gtk.org/2016/09/01/versioning-and-long-term-stability-promise-in-gtk > > Major new features include: > > * The Wayland backend has support for drawing tablets > > * The Wayland backend requires xdg-shell v6 > > * We have a gesture API for tablet support, GtkPadController > > * GdkMonitor offers an API for richer information about connected outputs > > * GdkGLContext supports GLES > > * GtkScrolledWindow has new max-content-width/height properties that can > affect the sizing behavior > > * GtkShortcutLabel is a new widget that can display keyboard shortcuts > in the same way that GtkShortcutWindow does > > * A number of GTK+ APIs will now transparently use portals when used > in a Flatpak sandbox, including GtkFileChooserNative, GtkPrintOperation, > gtk_show_uri. > > For more details and lists of fixed bugs, see the NEWS file that is > included in the tarball, or see: > > http://git.gnome.org/browse/gtk+/plain/NEWS?id=3.22.0 > > For concerns about porting from older GTK+ releases, see the README file > that is included in the tarball, or see: > > http://git.gnome.org/browse/gtk+/plain/README.in?id=3.22.0 GTK+ 3.22.26 was released in November 2017. [1] https://mail.gnome.org/archives/gnome-announce-list/2016-September/msg00044.html --- gtk3.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index d51864c73..241173585 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gtk3-3.16.6-0 +# BEE_VERSION gtk3-3.22.26-0 SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" From aa86d5e0c9f27bbb4e98b7b99d8d1b128f2de33e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:38:17 +0100 Subject: [PATCH 13/30] gtk3: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.22/gtk+-3.22.26.tar.xz creating gtk+-3.22.26-0.bee from template '/etc/default/bee/templates/fallback' ``` Add the configure switches back. --- gtk3.be0 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/gtk3.be0 b/gtk3.be0 index 241173585..e68e51197 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -2,28 +2,55 @@ # BEE_VERSION gtk3-3.22.26-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.) + +############################################################################### +## 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]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## 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. -# BEE_BUILDTYPE= +# EXCLUDE+=() -# EXCLUDE="" +############################################################################### +## 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. # 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 ${@} +# bee_extract "${@}" #} #mee_patch() { -# bee_patch ${@} +# bee_patch "${@}" #} mee_configure() { @@ -37,3 +64,22 @@ mee_configure() { #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 ae7b68eb2b149acb8578e835d0aeb5f4b6c1022d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:41:23 +0100 Subject: [PATCH 14/30] gtk3: Use GNOME domain name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the domain name used in the book *Linux from Scratch* [1]. It’s the same system. ``` $ host ftp.acc.umu.se ftp.acc.umu.se has address 194.71.11.165 ftp.acc.umu.se has address 194.71.11.173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::165 ftp.acc.umu.se mail is handled by 0 mail.acc.umu.se. $ host ftp.gnome.org ftp.gnome.org is an alias for ftp.acc.umu.se. ftp.acc.umu.se has address 194.71.11.165 ftp.acc.umu.se has address 194.71.11.173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::165 ftp.acc.umu.se mail is handled by 0 mail.acc.umu.se. ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/x/gtk3.html --- gtk3.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index e68e51197..17138c89f 100755 --- a/gtk3.be0 +++ b/gtk3.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]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 823f34cc8377e1e3d74c9d9cf79f851c0d3ab117 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:45:29 +0100 Subject: [PATCH 15/30] gtk3: Put each configure switch on its own line --- gtk3.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index 17138c89f..cbe44c5bc 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -54,7 +54,9 @@ SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${ #} mee_configure() { - bee_configure --enable-introspection --enable-xinerama + bee_configure \ + --enable-introspection \ + --enable-xinerama } #mee_build() { From b68b69036329dcb3d3f387348251cb9ed7b29a86 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:58:54 +0100 Subject: [PATCH 16/30] gtk3: Enable Wayland backend Because we can. > This switch enables the Wayland GDK backend. Replace with > --disable-wayland-backend if you do not have Wayland-1.14.0 and > wayland-protocols-1.12 or you do not wish to build GNOME with Wayland > support. Other changes may be needed to allow the build to complete > without the wayland-backend enabled. [1] http://www.linuxfromscratch.org/blfs/view/svn/x/gtk3.html --- gtk3.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gtk3.be0 b/gtk3.be0 index cbe44c5bc..dfa3c59ac 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -56,6 +56,7 @@ SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${ mee_configure() { bee_configure \ --enable-introspection \ + --enable-wayland-backend \ --enable-xinerama } From 7bfb98b9358c8def54b91ef607b22922c7b122ab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:00:19 +0100 Subject: [PATCH 17/30] gtk3: Explicitly enable X11 backend --- gtk3.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index dfa3c59ac..45eaf57fb 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -57,7 +57,8 @@ mee_configure() { bee_configure \ --enable-introspection \ --enable-wayland-backend \ - --enable-xinerama + --enable-xinerama \ + --enable-x11-backend } #mee_build() { From f5cab444525b29939ceff34741c79d1a7ecf8a3d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:25:28 +0100 Subject: [PATCH 18/30] colord: Strip trailing space --- colord-0.1.19-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colord-0.1.19-0.bee b/colord-0.1.19-0.bee index e43319a32..6c8232ae0 100755 --- a/colord-0.1.19-0.bee +++ b/colord-0.1.19-0.bee @@ -25,7 +25,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 15efea2f49d361a86cdb75d44deac6e32a9830c5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:25:37 +0100 Subject: [PATCH 19/30] colord: Securely download source archive Use HTTPS to securely download the source archive. --- colord-0.1.19-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colord-0.1.19-0.bee b/colord-0.1.19-0.bee index 6c8232ae0..e81bf388b 100755 --- a/colord-0.1.19-0.bee +++ b/colord-0.1.19-0.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="http://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" +SRCURL[0]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 17c174f3e42abf120887b361407e689b4aab179e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:26:37 +0100 Subject: [PATCH 20/30] colord: Convert to versionless bee file --- colord-0.1.19-0.bee => colord.be0 | 2 ++ 1 file changed, 2 insertions(+) rename colord-0.1.19-0.bee => colord.be0 (93%) diff --git a/colord-0.1.19-0.bee b/colord.be0 similarity index 93% rename from colord-0.1.19-0.bee rename to colord.be0 index e81bf388b..6dd2778cd 100755 --- a/colord-0.1.19-0.bee +++ b/colord.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION colord-0.1.19-0 + SRCURL[0]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" PATCHURL[0]="" From c3872dd7167dbd15b7aac2d200369f864b74e759 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:27:40 +0100 Subject: [PATCH 21/30] colord: Update version from 0.1.19 to 1.3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, updating to GTK+ 3.22.26, the GTK+ printer dialog doesn’t list any printers. ``` (evince:7186): Gtk-WARNING **: libcolord.so.2: cannot open shared object file: No such file or directory ``` So, update colord. Do not use colord 1.4.1 as that requires Meson. --- colord.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 6dd2778cd..3b47305d4 100755 --- a/colord.be0 +++ b/colord.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION colord-0.1.19-0 +# BEE_VERSION colord-1.3.5-0 SRCURL[0]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" From b1ca332b550789c9dabc21c9e4bb3c7ee3c24519 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:31:14 +0100 Subject: [PATCH 22/30] colord: Disable GUSB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` […] checking for GUSB... no configure: error: Package requirements (gusb >= 0.2.7) were not met: No package 'gusb' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables GUSB_CFLAGS and GUSB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. […] ``` --- colord.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/colord.be0 b/colord.be0 index 3b47305d4..61127d107 100755 --- a/colord.be0 +++ b/colord.be0 @@ -26,9 +26,10 @@ PATCHURL[0]="" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-gusb +} #mee_build() { # bee_build From d902dfae7751d39f3ff06a5cb40b3d892202923d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:33:56 +0100 Subject: [PATCH 23/30] colord: Disable systemd seat-tracking support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` […] checking for LIBSYSTEMD... no checking for LIBSYSTEMD_LOGIN... no configure: error: Package requirements (libsystemd-login >= 44) were not met: No package 'libsystemd-login' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBSYSTEMD_LOGIN_CFLAGS and LIBSYSTEMD_LOGIN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. […] ``` --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 61127d107..20a064ee7 100755 --- a/colord.be0 +++ b/colord.be0 @@ -28,7 +28,8 @@ PATCHURL[0]="" mee_configure() { bee_configure \ - --disable-gusb + --disable-gusb \ + --disable-systemd-login } #mee_build() { From ff62e3a512d94d89e63fa7cb186e1538850641e3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:35:44 +0100 Subject: [PATCH 24/30] colord: Disable ArgllCMS sensor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` […] checking for spotread... no configure: error: argyllcms sensor requires spotread, not found […] ``` --- colord.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/colord.be0 b/colord.be0 index 20a064ee7..572c600e6 100755 --- a/colord.be0 +++ b/colord.be0 @@ -28,6 +28,7 @@ PATCHURL[0]="" mee_configure() { bee_configure \ + --disable-argyllcms-sensor \ --disable-gusb \ --disable-systemd-login } From ed6a5eef497d4d307763fcbec34845a9f59c459f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:40:10 +0100 Subject: [PATCH 25/30] colord: Prevent installation of static versions of libraries --- colord.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/colord.be0 b/colord.be0 index 572c600e6..8fc0c8fa6 100755 --- a/colord.be0 +++ b/colord.be0 @@ -30,6 +30,7 @@ mee_configure() { bee_configure \ --disable-argyllcms-sensor \ --disable-gusb \ + --disable-static \ --disable-systemd-login } From 86b37b58170d457a92424b8343c90c4b4f800fa4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:41:03 +0100 Subject: [PATCH 26/30] colord: Disable GUDEV support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build currently fails with the errors below. So disable GUDEV support. ``` […] CC libcolord_la-cd-sensor-sync.lo /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c: In function ‘cd_edid_convert_pnp_id_to_string’: /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:126:9: error: implicit declaration of function ‘udev_hwdb_new’ [-Werror=implicit-function-declaration] hwdb = udev_hwdb_new (udev); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:126:2: warning: nested extern declaration of ‘udev_hwdb_new’ [-Wnested-externs] hwdb = udev_hwdb_new (udev); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:126:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion] hwdb = udev_hwdb_new (udev); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:132:6: error: implicit declaration of function ‘udev_hwdb_get_properties_list_entry’ [-Werror=implicit-function-declaration] e = udev_hwdb_get_properties_list_entry (hwdb, modalias, 0); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:132:2: warning: nested extern declaration of ‘udev_hwdb_get_properties_list_entry’ [-Wnested-externs] e = udev_hwdb_get_properties_list_entry (hwdb, modalias, 0); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:132:4: warning: assignment makes pointer from integer without a cast [-Wint-conversion] e = udev_hwdb_get_properties_list_entry (hwdb, modalias, 0); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:145:3: error: implicit declaration of function ‘udev_hwdb_unref’ [-Werror=implicit-function-declaration] udev_hwdb_unref (hwdb); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:145:3: warning: nested extern declaration of ‘udev_hwdb_unref’ [-Wnested-externs] cc1: some warnings being treated as errors Makefile:1171: recipe for target 'libcolordprivate_la-cd-edid.lo' failed […] ``` --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 8fc0c8fa6..b747cd050 100755 --- a/colord.be0 +++ b/colord.be0 @@ -31,7 +31,8 @@ mee_configure() { --disable-argyllcms-sensor \ --disable-gusb \ --disable-static \ - --disable-systemd-login + --disable-systemd-login \ + --disable-udev } #mee_build() { From dae34d84b2049dde44133d9c13d590f5682f546b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:50:45 +0100 Subject: [PATCH 27/30] colord: Set daemon user to *colord* [1] > --with-daemon-user=colord: This switch is used so the colord daemon > will run as an unprivileged user instead of root user. [1] http://www.linuxfromscratch.org/blfs/view/8.1/general/colord.html --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index b747cd050..6ea3be805 100755 --- a/colord.be0 +++ b/colord.be0 @@ -32,7 +32,8 @@ mee_configure() { --disable-gusb \ --disable-static \ --disable-systemd-login \ - --disable-udev + --disable-udev \ + --with-daemon-user=colord } #mee_build() { From 43cbd6d548ec55144fceff93e9d2bc339df06844 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:51:51 +0100 Subject: [PATCH 28/30] colord: Do not install systemd service unit [1] > --with-systemdsystemunitdir=no: Disables attempting to build with > systemd libraries. [1] http://www.linuxfromscratch.org/blfs/view/8.1/general/colord.html --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 6ea3be805..2d285a1dd 100755 --- a/colord.be0 +++ b/colord.be0 @@ -33,7 +33,8 @@ mee_configure() { --disable-static \ --disable-systemd-login \ --disable-udev \ - --with-daemon-user=colord + --with-daemon-user=colord \ + --without-systemdsystemunitdir } #mee_build() { From 818f71f2dae91e45bd2cb12cf48c5a28222ab59a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 17:06:24 +0100 Subject: [PATCH 29/30] colord: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz creating colord-1.3.5-0.bee from template '/etc/default/bee/templates/fallback' $ mv colord-1.3.5-0.bee colord.be0 $ vim colord.be0 $ git add colord.be0 ``` --- colord.be0 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/colord.be0 b/colord.be0 index 2d285a1dd..d7843b6ae 100755 --- a/colord.be0 +++ b/colord.be0 @@ -2,21 +2,48 @@ # BEE_VERSION colord-1.3.5-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.) + +############################################################################### +## 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]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## 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. -# BEE_BUILDTYPE= +# EXCLUDE+=() -# EXCLUDE="" +############################################################################### +## 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. # 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 "${@}" @@ -44,3 +71,22 @@ mee_configure() { #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 c8858d3829536abd70501e508060c48f764ed884 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 15 Dec 2017 12:07:09 +0100 Subject: [PATCH 30/30] Revert "colord: Do not install systemd service unit [1]" This reverts commit 43cbd6d548ec55144fceff93e9d2bc339df06844. Programs using the GTK+ printing dialog print warnings to the terminal about the missing service file. ``` ** (evince:4561): WARNING **: failed to contact colord: Error calling StartServiceByName for org.freedesktop.ColorManager: GDBus.Error:org.freedesktop.systemd1.LoadFailed: Unit colord.service failed to load: No such file or directory. See system logs and 'systemctl status' for details. ``` --- colord.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/colord.be0 b/colord.be0 index d7843b6ae..6c61121ce 100755 --- a/colord.be0 +++ b/colord.be0 @@ -60,8 +60,7 @@ mee_configure() { --disable-static \ --disable-systemd-login \ --disable-udev \ - --with-daemon-user=colord \ - --without-systemdsystemunitdir + --with-daemon-user=colord } #mee_build() {