diff --git a/main/postmarketos-ui-matchbox/APKBUILD b/main/postmarketos-ui-matchbox/APKBUILD new file mode 100644 index 000000000..220b45829 --- /dev/null +++ b/main/postmarketos-ui-matchbox/APKBUILD @@ -0,0 +1,19 @@ +pkgname=postmarketos-ui-matchbox +pkgver=1 +pkgrel=0 +pkgdesc="(X11) Very basic user interface for handhelds" +url="https://matchbox-project.org" +arch="noarch" +license="GPL-2.0-only" +depends="matchbox-common matchbox-panel matchbox-panel-manager matchbox-desktop matchbox-keyboard matchbox-window-manager mb-applet-input-manager xterm xorg-server dbus-x11 mesa-egl" +install="$pkgname.post-install" +source="start_matchbox.sh" +options="!check" + +package() { + # Autostart via autologin on TTY0 (until we have a display manager #656) + install -D -m644 "$srcdir"/start_matchbox.sh \ + "$pkgdir"/etc/profile.d/start_matchbox.sh +} + +sha512sums="9286e12744fc313fd3ed842dbc524226c2714cffb6fdd1327ff079527546a5c0b0738ce5a444fd534fb267fbde2759b552784cbed09ec988cd4abfa2d0001319 start_matchbox.sh" diff --git a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-install b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-install new file mode 100644 index 000000000..c87b4e9b1 --- /dev/null +++ b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-install @@ -0,0 +1,12 @@ +#!/bin/sh + +# Autologin on tty1, let busybox autoconfigure 2-6 +autologin="$(getent passwd 1000 | cut -d ":" -f 1)" +for i in 1 2 3 4 5 6; do + old="^tty$i::respawn:/sbin/getty 38400 tty$i" + new="# tty$i::respawn:/sbin/getty 38400 tty$i" + [ "$i" = "1" ] && new="tty1::respawn:/bin/login -f $autologin" + sed -i -e "s.$old.$new.g" /etc/inittab +done + + diff --git a/main/postmarketos-ui-matchbox/start_matchbox.sh b/main/postmarketos-ui-matchbox/start_matchbox.sh new file mode 100644 index 000000000..69e0cbfb1 --- /dev/null +++ b/main/postmarketos-ui-matchbox/start_matchbox.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Mate autostart on tty1 (Autologin on tty1 is enabled in +# /etc/inittab by postmarketos-base post-install.hook). +# This is a temporary solution, we'll need something like a +# display manager in the long run (#656). +if [ "$(id -u)" = "1000" ] && [ "$(tty)" = "/dev/tty1" ]; then + # Start X11 with Mate + startx /usr/bin/matchbox-session 2>&1 | logger -t "$(whoami):x11" + + + # In case of failure, restart after 1s + sleep 1 + exit +fi diff --git a/matchbox/libmatchbox/APKBUILD b/matchbox/libmatchbox/APKBUILD new file mode 100644 index 000000000..7b6b3b187 --- /dev/null +++ b/matchbox/libmatchbox/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=libmatchbox +pkgver=1.12 +pkgrel=0 +pkgdesc="Library for matchbox window manager" +url="http://matchbox-project.org" +arch="all" +license="GPL-2.0-only" +depends="pango glib jpeg libpng libx11 libxext libxft" +makedepends="autoconf automake libtool libx11-dev libxext-dev libxft-dev pango-dev doxygen libjpeg-turbo-dev" +install="" +subpackages="$pkgname-dev" +source="$pkgname-$pkgver.tar.gz::https://git.yoctoproject.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + autoreconf --install + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-pango \ + --enable-doxygen-docs \ + --enable-jpeg \ + --enable-unit-tests + make +} +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="28392757960a41272e3ac32b8698549be6ee923a79f17a3b648abd59efcf5bda3eaa6de18337e1920a5ca602d7c8f3031c5418a4ce44d6c39376c70aeb49267a libmatchbox-1.12.tar.gz" diff --git a/matchbox/libxsettings-client/01-ignore-xsettings-common-h.patch b/matchbox/libxsettings-client/01-ignore-xsettings-common-h.patch new file mode 100644 index 000000000..31229d2e9 --- /dev/null +++ b/matchbox/libxsettings-client/01-ignore-xsettings-common-h.patch @@ -0,0 +1,25 @@ +--- a/Makefile.am 2018-04-16 09:15:05.172748991 +0100 ++++ b/Makefile.am 2018-04-16 09:15:43.009935778 +0100 +@@ -1,7 +1,7 @@ + SUBDIRS = doc + +-source_h = xsettings-client.h xsettings-common.h +-source_c = xsettings-client.c xsettings-common.c ++source_h = xsettings-client.h ++source_c = xsettings-client.c + + INCLUDES = -I $(includedir) $(X_CFLAGS) + +--- a/Makefile.in 2018-04-16 09:15:05.172748991 +0100 ++++ b/Makefile.in 2018-04-16 09:16:02.733032247 +0100 +@@ -141,8 +141,8 @@ + target_alias = @target_alias@ + SUBDIRS = doc + +-source_h = xsettings-client.h xsettings-common.h +-source_c = xsettings-client.c xsettings-common.c ++source_h = xsettings-client.h ++source_c = xsettings-client.c + + INCLUDES = -I $(includedir) $(X_CFLAGS) + diff --git a/matchbox/libxsettings-client/APKBUILD b/matchbox/libxsettings-client/APKBUILD new file mode 100644 index 000000000..158b8cc5c --- /dev/null +++ b/matchbox/libxsettings-client/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=libxsettings-client +pkgver=0.17 +pkgrel=0 +pkgdesc="Utility functions for the Xsettings protocol" +url="https://standards.freedesktop.org/xsettings-spec/0.5/" +arch="all" +license="GPL-2.0-or-later" +depends="libx11" +makedepends="libx11-dev gtk+2.0-dev" +source="http://http.debian.net/debian/pool/main/libx/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz + 01-ignore-xsettings-common-h.patch" +builddir="${srcdir}/${pkgname}-${pkgver}" +options="!check" +subpackages="$pkgname-doc $pkgname-dev" + +prepare() { + default_prepare + update_config_sub + update_config_guess +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make LIBS=-lX11 +} +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2ea1f1d239fb17f37b2ec7689aca1a848b3faee8052b622f718f9bb0f3e7b174ae5d056c4d8a27ef526ade3e0ad155ebc73de6084b837d7cb5a93bb31f92bfa7 libxsettings-client_0.17.orig.tar.gz +428a76a40ddb9a7fb3d7c461e91cff53148c9856c8a1f231f2d4f0b2b40fd1e6dbef9d67b2f745e728921ae3846f1caa1f85cd537961bbe7421fefe516f6b070 01-ignore-xsettings-common-h.patch" diff --git a/matchbox/libxsettings/APKBUILD b/matchbox/libxsettings/APKBUILD new file mode 100644 index 000000000..a2ae02571 --- /dev/null +++ b/matchbox/libxsettings/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=libxsettings +pkgver=0.11 +pkgrel=0 +pkgdesc="Xsettings protocol library for GPE Palmtop Environment" +url="https://standards.freedesktop.org/xsettings-spec/0.5/" +arch="all" +license="GPL-2.0-or-later" +depends="libx11" +makedepends="libx11-dev" +source="http://http.debian.net/debian/pool/main/libx/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz" +builddir="${srcdir}/${pkgname}-${pkgver}" +subpackages="$pkgname-dev" +options="!check" + +dev () { + cd "$builddir" + mkdir -p "$subpkgdir"/usr + make PREFIX="/usr" DESTDIR="$subpkgdir" install-devel +} +build () { + cd "$builddir" + make +} +package() { + cd "$builddir" + make PREFIX="/usr" DESTDIR="$pkgdir" install +} + +sha512sums="9b385949673e5de28d711dcbcd3b924fe9da9176002bfb32785f384220d4e4d6a66a12cf0cfc36a77994fe4d8623e6557ae09995889f915b9c319147ed134942 libxsettings_0.11.orig.tar.gz" diff --git a/matchbox/matchbox-common/APKBUILD b/matchbox/matchbox-common/APKBUILD new file mode 100644 index 000000000..f179cb53b --- /dev/null +++ b/matchbox/matchbox-common/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=matchbox-common +pkgver=0_git20070606 +pkgrel=0 +_commit=3055fb158054d059e9a50141e7ded2a41ecfbd47 +pkgdesc="Common data files for Matchbox" +url="http://matchbox-project.org" +arch="noarch" +license="GPL-2.0-only" +depends="" +makedepends="libmatchbox-dev autoconf automake libtool" +source="https://git.yoctoproject.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" +options="!check" + +build() { + cd "$builddir" + ./autogen.sh + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="742c38c60efa99de6a7d9bf510045eaf8ea1038722c9e45d614b66a3112f2b48f715d53bf9d44f173ca35e858aee135d0fbc3ed4fe0937b74c40ac515c5320f4 matchbox-common-3055fb158054d059e9a50141e7ded2a41ecfbd47.tar.gz" diff --git a/matchbox/matchbox-desktop/01-needed-libraries.patch b/matchbox/matchbox-desktop/01-needed-libraries.patch new file mode 100644 index 000000000..b68159767 --- /dev/null +++ b/matchbox/matchbox-desktop/01-needed-libraries.patch @@ -0,0 +1,25 @@ +Description: FTBFS with binutils-gold (#555587) +Author: Bhavani Shankar R +Last-Update: 2010-12-28 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ + matchbox_desktop_CFLAGS = \ + -Wall + matchbox_desktop_LDADD = \ +- $(GTK_LIBS) $(SN_LIBS) ++ $(GTK_LIBS) $(SN_LIBS) -lX11 + + matchbox_desktop_SOURCES = \ + taku-tile.h taku-tile.c \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -183,7 +183,7 @@ + -Wall + + matchbox_desktop_LDADD = \ +- $(GTK_LIBS) $(SN_LIBS) ++ $(GTK_LIBS) $(SN_LIBS) -lX11 + + matchbox_desktop_SOURCES = \ + taku-tile.h taku-tile.c \ diff --git a/matchbox/matchbox-desktop/APKBUILD b/matchbox/matchbox-desktop/APKBUILD new file mode 100644 index 000000000..8231657ab --- /dev/null +++ b/matchbox/matchbox-desktop/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=matchbox-desktop +pkgver=0.9.1_git20050406 +pkgrel=0 +_commit=525e271308bd21307abaf2c972610219351edff5 +pkgdesc="Desktop system for handhelds using the GTK+2 stack" +url="https://matchbox-project.org" +arch="all" +license="GPL-2.0-only" +depends="gdk-pixbuf glib gtk+2.0 pango startup-notification libx11 matchbox-common libmatchbox libjpeg-turbo" +makedepends="startup-notification-dev gtk+2.0-dev autoconf automake libtool libmatchbox-dev libjpeg-turbo-dev" +source="https://git.yoctoproject.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" +options="!check" + +build() { + cd "$builddir" + ./autogen.sh + ./configure \ + --enable-startup-notification \ + --enable-dnotify \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR=$pkgdir install +} + +sha512sums="ca4cafe4c0c14d6a60bc16e302a3eb623371357abcd168ceaaa78c15334d32351382d6e56919b1fd6c1de274e2cd9d08648c0ab4a385e8c62ec38b6c8c6a86a4 matchbox-desktop-525e271308bd21307abaf2c972610219351edff5.tar.gz" diff --git a/main/matchbox-keyboard/APKBUILD b/matchbox/matchbox-keyboard/APKBUILD similarity index 97% rename from main/matchbox-keyboard/APKBUILD rename to matchbox/matchbox-keyboard/APKBUILD index ef9a8f85d..daa6995c1 100644 --- a/main/matchbox-keyboard/APKBUILD +++ b/matchbox/matchbox-keyboard/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="An on screen virtual keyboard" url="http://matchbox-project.org/" arch="all" -license="GPL" +license="GPL-2.0-only" depends="libfakekey libxft" makedepends="autoconf automake libtool libxft-dev libxtst-dev" source="$pkgname-$pkgver.tar.bz2::http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-keyboard/snapshot/matchbox-keyboard-$pkgver.tar.bz2" diff --git a/matchbox/matchbox-panel-manager/01-linking-fix.patch b/matchbox/matchbox-panel-manager/01-linking-fix.patch new file mode 100644 index 000000000..2c4605654 --- /dev/null +++ b/matchbox/matchbox-panel-manager/01-linking-fix.patch @@ -0,0 +1,25 @@ +Description: Fix FTBFS with binutils-gold (#555590) +Author: Bhavani Shankar R +Last-Update: 2010-12-28 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ + matchbox_panel_manager_SOURCES = \ + mbpanelmgr.c + +-matchbox_panel_manager_LDADD = @MBPANELMGR_LIBS@ ++matchbox_panel_manager_LDADD = @MBPANELMGR_LIBS@ -lX11 + + desktopdir = $(datadir)/applications/ + pixmapsdir = $(datadir)/pixmaps/ +--- a/Makefile.in ++++ b/Makefile.in +@@ -119,7 +119,7 @@ + mbpanelmgr.c + + +-matchbox_panel_manager_LDADD = @MBPANELMGR_LIBS@ ++matchbox_panel_manager_LDADD = @MBPANELMGR_LIBS@ -lX11 + + desktopdir = $(datadir)/applications/ + pixmapsdir = $(datadir)/pixmaps/ diff --git a/matchbox/matchbox-panel-manager/APKBUILD b/matchbox/matchbox-panel-manager/APKBUILD new file mode 100644 index 000000000..559c1c994 --- /dev/null +++ b/matchbox/matchbox-panel-manager/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=matchbox-panel-manager +pkgver=0.1 +pkgrel=0 +pkgdesc="Panel manager for matchbox-panel" +url="http://matchbox-project.org" +arch="all" +license="GPL-2.0-only" +depends="startup-notification gdk-pixbuf glib gtk+2.0 libx11 expat" +makedepends="autoconf libtool automake gtk+2.0-dev libmatchbox-dev startup-notification-dev expat-dev" +source="${pkgname}_${pkgver}.orig.tar.gz::http://http.debian.net/debian/pool/main/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz + 01-linking-fix.patch" +builddir="$srcdir/$pkgname-$pkgver" +options="!check" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="1c860d3452e6f9feb2f602f208ed1d1245a638c3e5f2baf1ee2c0614cbf9b52519902de7fda1aabe1b3b03e8960d9b6fb2f61ac97df51a97fe3208aceea34ec2 matchbox-panel-manager_0.1.orig.tar.gz +5105da67046fd9a62ca9cab70ecc7bfe1319463719d365b3325594b8c71b84234aade023634fdf2c9ca7fdb8802c9cd8d72b3f43819c93b27181c681a024f091 01-linking-fix.patch" diff --git a/matchbox/matchbox-panel/APKBUILD b/matchbox/matchbox-panel/APKBUILD new file mode 100644 index 000000000..24b8b0ddb --- /dev/null +++ b/matchbox/matchbox-panel/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Duncan Guthrie +# Maintainer: Duncan Guthrie +pkgname=matchbox-panel +pkgver=0_git20100816 +pkgrel=0 +_commit=886605280c1032f76e382f68f9a1d2e57012f4db +pkgdesc="Simple GTK+2-based panel for handheld devices" +url="http://matchbox-project.org" +arch="all" +license="GPL-2.0-only" +depends="libmatchbox startup-notification libx11 libxext matchbox-common libjpeg-turbo" +makedepends="libmatchbox-dev startup-notification-dev libx11-dev autoconf automake libtool libjpeg-turbo-dev" +source="$pkgname-$_commit.tar.gz::https://git.yoctoproject.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" +options="!check" + +build() { + cd "$builddir" + autoreconf --install + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-startup-notification \ + --enable-expat + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6a5d9bdd612d7149e9852f9b3672fb39248fc116a0a74e0680ced67e6ca784a1596ebf3ec62a8657d44a7056e0d9781f303461e6c8cea442935da50918fff04e matchbox-panel-886605280c1032f76e382f68f9a1d2e57012f4db.tar.gz" diff --git a/matchbox/matchbox-window-manager/01-build-themes.patch b/matchbox/matchbox-window-manager/01-build-themes.patch new file mode 100644 index 000000000..6886f825c --- /dev/null +++ b/matchbox/matchbox-window-manager/01-build-themes.patch @@ -0,0 +1,10 @@ +Description: Build all themes +--- matchbox-window-manager-1.2-osso21.orig/matchbox-window-manager/data/themes/Makefile.am ++++ matchbox-window-manager-1.2-osso21/matchbox-window-manager/data/themes/Makefile.am +@@ -1,5 +1,5 @@ + if WANT_STANDALONE + SUBDIRS = + else +-SUBDIRS = Default ++SUBDIRS = Default blondie bluebox borillo MBOpus + endif diff --git a/matchbox/matchbox-window-manager/02-config.patch b/matchbox/matchbox-window-manager/02-config.patch new file mode 100644 index 000000000..eb5185f39 --- /dev/null +++ b/matchbox/matchbox-window-manager/02-config.patch @@ -0,0 +1,12 @@ +Description: Fix pkg-config use +--- a/matchbox-window-manager/configure.ac ++++ b/matchbox-window-manager/configure.ac +@@ -423,7 +423,7 @@ + if test x$enable_standalone != xyes && test x$enable_standalone_xft != xyes; then + AC_MSG_CHECKING([for libmb xsettings support]) + +- if $PKG_CONFIG --libs libmb | grep -i xsettings ; then ++ if $PKG_CONFIG --static --libs libmb | grep -i xsettings ; then + mb_have_xsettings="yes" + AC_DEFINE(USE_XSETTINGS, [1], [Use XSettings]) + AC_MSG_RESULT([yes]) diff --git a/matchbox/matchbox-window-manager/03-default-theme.patch b/matchbox/matchbox-window-manager/03-default-theme.patch new file mode 100644 index 000000000..9b7dff70d --- /dev/null +++ b/matchbox/matchbox-window-manager/03-default-theme.patch @@ -0,0 +1,113 @@ +Description: Revert to old version of theme.xml for Default theme (current upstream version doesn't work) +--- a/matchbox-window-manager/data/themes/Default/theme.xml ++++ b/matchbox-window-manager/data/themes/Default/theme.xml +@@ -1,5 +1,5 @@ + +- + + +@@ -31,37 +31,55 @@ + + + ++ + ++ ++ ++ ++ ++ ++ ++ + +- +- ++ + +- ++ ++ ++ ++ + +- ++ ++ ++ + +- +- + +- + +- ++