From d05edbfd59d841488af0ef8144cc4b4870f9c11c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Mar 2018 13:01:57 +0100 Subject: [PATCH 1/7] fltk: Recreate with current template --- fltk-1.3.2-0.bee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fltk-1.3.2-0.bee b/fltk-1.3.2-0.bee index b5c3ca6be..e3029fb2c 100755 --- a/fltk-1.3.2-0.bee +++ b/fltk-1.3.2-0.bee @@ -7,7 +7,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://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz" +SRCURL[0]="http://fltk.org/pub/fltk/${PKGVERSION}/fltk-${PKGVERSION}-source.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -22,8 +22,8 @@ SRCURL[0]="http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz" # 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 +## 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 @@ -75,7 +75,7 @@ mee_configure() { ## 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 c81b09cf3ef99607ed2d062c992eee7cf0c98ea9 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Mar 2018 13:03:12 +0100 Subject: [PATCH 2/7] fltk: Convert to versionless bee file --- fltk-1.3.2-0.bee => fltk.be0 | 2 ++ 1 file changed, 2 insertions(+) rename fltk-1.3.2-0.bee => fltk.be0 (98%) diff --git a/fltk-1.3.2-0.bee b/fltk.be0 similarity index 98% rename from fltk-1.3.2-0.bee rename to fltk.be0 index e3029fb2c..b93f4a27d 100755 --- a/fltk-1.3.2-0.bee +++ b/fltk.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION fltk-1.3.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 3644c980f8d8048808463875cc58d3550bccc772 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Mar 2018 13:09:55 +0100 Subject: [PATCH 3/7] fltk: Update version from 1.3.2 to 1.3.4_2 Update required for tigervnc FLTK release history: http://www.fltk.org/articles.php?L825 --- fltk.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fltk.be0 b/fltk.be0 index b93f4a27d..82f278a64 100755 --- a/fltk.be0 +++ b/fltk.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION fltk-1.3.2-0 +# BEE_VERSION fltk-1.3.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.) @@ -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://fltk.org/pub/fltk/${PKGVERSION}/fltk-${PKGVERSION}-source.tar.gz" +SRCURL[0]="http://fltk.org/pub/fltk/${PKGVERSION}/fltk-${PKGVERSION}${PKGEXTRAVERSION_DASH}-source.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From cded3bf6ae45b7c406725fe1caf7bb7b58334253 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Mar 2018 13:32:53 +0100 Subject: [PATCH 4/7] tigervnc: Add version 1.8.0 http://tigervnc.org/ --- tigervnc.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 tigervnc.be0 diff --git a/tigervnc.be0 b/tigervnc.be0 new file mode 100755 index 000000000..1d6b412a9 --- /dev/null +++ b/tigervnc.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION tigervnc-1.8.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://github.com/TigerVNC/tigervnc/archive/v${PKGVERSION}/tigervnc-${PKGVERSION}.tar.gz" + +############################################################################### +## 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 990d62ca942913dfe87009cc6d5ab7b81cf4c710 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Mar 2018 14:29:24 +0100 Subject: [PATCH 5/7] tigervnc: Add libraries from fltl-config There is some logic in CMakeLists.txt to create the list of required link libraries in FLTK_LIBRARIES. This depends on the output of FindFLTK.cmake provided by cmake. The logic seems to fail as several libraries are missing in the end: [ 89%] Linking CXX executable vncviewer /usr/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64/libfltk.a(Fl_Window_shape.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' /lib/libdl.so.2: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status vncviewer/CMakeFiles/vncviewer.dir/build.make:427: recipe for target 'vncviewer/vncviewer' failed make[2]: *** [vncviewer/vncviewer] Error 1 Overwrite the computed FLTK_LIBRARIES with the output of fltk-config --use-images --ldflags which seems to enumerate the required libraries. --- tigervnc.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tigervnc.be0 b/tigervnc.be0 index 1d6b412a9..b1f64f9eb 100755 --- a/tigervnc.be0 +++ b/tigervnc.be0 @@ -53,9 +53,9 @@ SRCURL[0]="https://github.com/TigerVNC/tigervnc/archive/v${PKGVERSION}/tigervnc- # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure -DFLTK_LIBRARIES="$(fltk-config --use-images --ldflags)" +} #mee_build() { # bee_build From 984bcae505e247fcf55a9ecc01735785eaaf5c85 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 9 Mar 2018 14:22:57 +0100 Subject: [PATCH 6/7] tigervnc: Add Xvnc Xvnc is the X.org xserver with a framebuffer display (like Xvfb) but adapted by tigervnc to offer the framebuffer via the vnc protocol. Build instructions : https://github.com/TigerVNC/tigervnc/blob/7cc9f6ad07db1f4f7f141d229d2dc5035bd2f89d/BUILDING.txt#L97 Some configure option suggested by the above instructions are not recognized by the x.org xserver 1.19.6 configure script and removed: --disable-config-dbus --enable-install-libxf86config --with-fontdir --with-dri-driver-path The option --disable-xwayland has been added to avoid the creation of /usr/bin/Xwayland conflicting with the xorg-server package. Installation of a Xserver manpage has been disabled for the same reason. --- tigervnc.be0 | 53 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/tigervnc.be0 b/tigervnc.be0 index b1f64f9eb..cc12b550a 100755 --- a/tigervnc.be0 +++ b/tigervnc.be0 @@ -2,6 +2,9 @@ # BEE_VERSION tigervnc-1.8.0-0 +XORG_SERVER_VERSION=1.19.6 +XORG_SERVER_NNN=119 + ## 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.) @@ -10,6 +13,7 @@ ## downloaded. Version variables may be used to simplify reuse of this bee-file. SRCURL[0]="https://github.com/TigerVNC/tigervnc/archive/v${PKGVERSION}/tigervnc-${PKGVERSION}.tar.gz" +SRCURL[1]="https://ftp.x.org/pub/individual/xserver/xorg-server-$XORG_SERVER_VERSION.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -55,15 +59,52 @@ SRCURL[0]="https://github.com/TigerVNC/tigervnc/archive/v${PKGVERSION}/tigervnc- mee_configure() { bee_configure -DFLTK_LIBRARIES="$(fltk-config --use-images --ldflags)" + ( + if [ -z "${DEFCONFIG}" ] ; then + for var in prefix bindir sbindir libexecdir sysconfdir \ + sharedstatedir localstatedir libdir includedir \ + datarootdir datadir infodir localedir mandir docdir ; do + DEFCONFIG="${DEFCONFIG} \${${var^^}:+--${var,,}=\${${var^^}}}" + done + fi + eval DEFCONFIG=\"${DEFCONFIG}\" + + start_cmd cp -R $S/unix/xserver $B/unix/ + start_cmd cp -R $S/xorg-server-$XORG_SERVER_VERSION/* $B/unix/xserver/ + start_cmd cd unix/xserver + start_cmd patch -p1 < $S/unix/xserver$XORG_SERVER_NNN.patch + start_cmd autoreconf -fiv + start_cmd ./configure $DEFCONFIG \ + --with-pic --without-dtrace --disable-static --disable-dri \ + --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ + --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ + --disable-config-hal --disable-config-udev \ + --disable-dri2 --enable-glx \ + --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-xkb-bin-directory=/usr/bin \ + --with-serverconfig-path=/usr/lib[64]/xorg \ + --disable-xwayland + ) } -#mee_build() { -# bee_build -#} +mee_build() { + bee_build + ( + start_cmd cd $B/unix/xserver + bee_build TIGERVNC_SRCDIR=$S + ) +} -#mee_install() { -# bee_install -#} +mee_install() { + bee_install + ( + start_cmd cd $B/unix/xserver + bee_install + rm $D$MANDIR/man1/Xserver.1 + ) +} ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From a84d92b0c702a5a6141a5dc258a230deb696f0e0 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 9 Mar 2018 15:27:44 +0100 Subject: [PATCH 7/7] tigervnc: Add patch to default session to xfce4 Default the x-session to xfce4 instead of twm and a xterm. --- tigervnc.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tigervnc.be0 b/tigervnc.be0 index cc12b550a..2303368ec 100755 --- a/tigervnc.be0 +++ b/tigervnc.be0 @@ -19,7 +19,7 @@ SRCURL[1]="https://ftp.x.org/pub/individual/xserver/xorg-server-$XORG_SERVER_VER ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +PATCHURL+=(/src/mariux/patches/tigervnc-vncserver-Change-default-xstartup-to-xfce4-session.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not