From 03649aae4c16175027b155150f1950fd1ddf0ce0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 11:57:07 +0200 Subject: [PATCH 01/10] libnotify: Strip trailing space --- libnotify-0.7.3-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnotify-0.7.3-0.bee b/libnotify-0.7.3-0.bee index 6da50722c..94d444048 100755 --- a/libnotify-0.7.3-0.bee +++ b/libnotify-0.7.3-0.bee @@ -17,7 +17,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 1c064a2c9786145f8af321c6d0c437481f9038f7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 11:57:28 +0200 Subject: [PATCH 02/10] libnotify: Securely download source archive over HTTPS --- libnotify-0.7.3-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnotify-0.7.3-0.bee b/libnotify-0.7.3-0.bee index 94d444048..341072e22 100755 --- a/libnotify-0.7.3-0.bee +++ b/libnotify-0.7.3-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From b61afdbe1e7b8ae1d8f34f42d7fa34cdcc929945 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 11:58:04 +0200 Subject: [PATCH 03/10] libnotify: Use more general ftp.gnome.org over university one --- libnotify-0.7.3-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnotify-0.7.3-0.bee b/libnotify-0.7.3-0.bee index 341072e22..1c057e995 100755 --- a/libnotify-0.7.3-0.bee +++ b/libnotify-0.7.3-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From bef924121e79fa976a3e1e734e376103a82138a9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:00:02 +0200 Subject: [PATCH 04/10] libnotify: Recreate bee file with current template Run the command below. $ bee init -f https://ftp.gnome.org/pub/gnome/sources/libnotify/0.7/libnotify-0.7.3.tar.bz2 creating libnotify-0.7.3-0.bee from template '/etc/default/bee/templates/fallback' --- libnotify-0.7.3-0.bee | 87 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 17 deletions(-) diff --git a/libnotify-0.7.3-0.bee b/libnotify-0.7.3-0.bee index 1c057e995..97e072ae7 100755 --- a/libnotify-0.7.3-0.bee +++ b/libnotify-0.7.3-0.bee @@ -1,30 +1,83 @@ -#!/bin/env beesh +#!/usr/bin/env beesh + +## 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.gnome.org/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" +############################################################################### +## 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 -PGRP=( uncategorized ) +############################################################################### +## 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 -# BEE_CONFIGURE=compat +############################################################################### +## 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}" -# EXCLUDE="" +#mee_extract() { +# bee_extract "${@}" +#} -mee_patch() { - bee_patch -} +#mee_patch() { +# bee_patch "${@}" +#} -mee_configure() { - bee_configure -} +#mee_configure() { +# bee_configure +#} -mee_build() { - bee_build -} +#mee_build() { +# bee_build +#} -mee_install() { - bee_install -} +#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 de4636fd67a46c1dd8ea309c3f4f6f4fca3128b3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:01:25 +0200 Subject: [PATCH 05/10] libnotify: Convert to versionless bee file --- libnotify-0.7.3-0.bee => libnotify.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libnotify-0.7.3-0.bee => libnotify.be0 (98%) diff --git a/libnotify-0.7.3-0.bee b/libnotify.be0 similarity index 98% rename from libnotify-0.7.3-0.bee rename to libnotify.be0 index 97e072ae7..32fce1a49 100755 --- a/libnotify-0.7.3-0.bee +++ b/libnotify.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libnotify-0.7.3-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 705d71a0802af21b2cbabe02f4e8090a18d38f08 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:07:40 +0200 Subject: [PATCH 06/10] libnotify: Update version from 0.7.3 to 0.7.7 xfce4-notifyd 0.4.2 needs this version. [Change-log for 0.7.7][1]: > New in 0.7.7 > ============ > > - Introspection fixes (Evan Nemerson) > - Allow to disable tests at build time (Quentin Glidic) [1]: https://ftp.gnome.org/pub/gnome/sources/libnotify/0.7/libnotify-0.7.7.news --- libnotify.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnotify.be0 b/libnotify.be0 index 32fce1a49..0fca3ecf0 100755 --- a/libnotify.be0 +++ b/libnotify.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libnotify-0.7.3-0 +# BEE_VERSION libnotify-0.7.7-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.) @@ -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.gnome.org/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/libnotify/${PKGVERSION[2]}/libnotify-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 12c143424b959a8382d5ab1f20b1f5870237f052 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:17:26 +0200 Subject: [PATCH 07/10] libnotify: Prevent installation of static versions of libraries --- libnotify.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libnotify.be0 b/libnotify.be0 index 0fca3ecf0..4c506e568 100755 --- a/libnotify.be0 +++ b/libnotify.be0 @@ -53,9 +53,10 @@ SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/libnotify/${PKGVERSION[2]}/li # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From b692cf71923adcacad76ae300316cc1c0682f007 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:10:12 +0200 Subject: [PATCH 08/10] xfce4-notifyd: Add version 0.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Description][1]: > Xfce4-notifyd is a notification service for the Xfce Desktop that > implements most of the “server-side” portion of the Freedesktop > desktop notifications specification. Applications that wish to pop up > a notification bubble in a standard way can implicitly make use of > xfce4-notifyd to do so by sending standard messages over D-Bus using > the `org.freedesktop.Notifications` interface. Create the bee file with the command below. $ bee init https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.2.tar.bz2 creating xfce4-notifyd-0.4.2-0.bee from template '/etc/default/bee/templates/fallback' This is going to replace GNOME’s notification daemon, as with that version, notifications are not properly scaled on 4K displays. Fixes: https://github.molgen.mpg.de/mariux64/bee-files/issues/878 [1]: https://docs.xfce.org/apps/notifyd/start [2]: http://www.linuxfromscratch.org/blfs/view/svn/xfce/xfce4-notifyd.html [3]: https://bugzilla.xfce.org/show_bug.cgi?id=14618 --- xfce4-notifyd-0.4.2-0.bee | 83 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 xfce4-notifyd-0.4.2-0.bee diff --git a/xfce4-notifyd-0.4.2-0.bee b/xfce4-notifyd-0.4.2-0.bee new file mode 100755 index 000000000..c054a9fb1 --- /dev/null +++ b/xfce4-notifyd-0.4.2-0.bee @@ -0,0 +1,83 @@ +#!/usr/bin/env beesh + +## 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://archive.xfce.org/src/apps/xfce4-notifyd/${PKGVERSION[2]}/xfce4-notifyd-${PKGVERSION}.tar.bz2" + +############################################################################### +## 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 99d36422d4e57645ae20fe88e2d9acf04ff76a83 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:14:55 +0200 Subject: [PATCH 09/10] xfce4-notifyd: Convert to versionless bee file --- xfce4-notifyd-0.4.2-0.bee => xfce4-notifyd.be0 | 2 ++ 1 file changed, 2 insertions(+) rename xfce4-notifyd-0.4.2-0.bee => xfce4-notifyd.be0 (98%) diff --git a/xfce4-notifyd-0.4.2-0.bee b/xfce4-notifyd.be0 similarity index 98% rename from xfce4-notifyd-0.4.2-0.bee rename to xfce4-notifyd.be0 index c054a9fb1..2cc404180 100755 --- a/xfce4-notifyd-0.4.2-0.bee +++ b/xfce4-notifyd.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION xfce4-notifyd-0.4.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.) From ef6591323a3c8834328bfd19b77cdcb75234d383 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Aug 2018 12:22:11 +0200 Subject: [PATCH 10/10] notification-daemon: Remove version 0.7.1 The notifications are not properly scaled in Xfce with a 4K display [1]. This is probably fixed in newer version, but as we use Xfce, use their notification daemon instead of the one from GNOME. [1]: https://bugzilla.xfce.org/show_bug.cgi?id=14618 --- notification-daemon-0.7.1-0.bee | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100755 notification-daemon-0.7.1-0.bee diff --git a/notification-daemon-0.7.1-0.bee b/notification-daemon-0.7.1-0.bee deleted file mode 100755 index 0b617d4e5..000000000 --- a/notification-daemon-0.7.1-0.bee +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-0.4.0.tar.bz2" - -PATCHURL[0]="" - -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - -mee_patch() { - bee_patch - - sed -i -e "437s@,@);@;438d" src/capplet/notification-properties.c - -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} -