matchbox: miscellaneous fixes (#1475)
This commit is contained in:
Duncan Guthrie
Oliver Smith
parent
0272a7de51
commit
77b61a05ba
@ -1,11 +1,11 @@
|
||||
pkgname=postmarketos-ui-matchbox
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
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"
|
||||
depends="matchbox-common matchbox-panel matchbox-desktop matchbox-keyboard matchbox-window-manager xterm xorg-server dbus-x11 mesa-egl"
|
||||
install="$pkgname.post-install"
|
||||
source="start_matchbox.sh"
|
||||
options="!check"
|
||||
|
||||
@ -2,16 +2,17 @@
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
pkgname=libmatchbox
|
||||
pkgver=1.12
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
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"
|
||||
source="$pkgname-$pkgver.tar.gz::https://git.yoctoproject.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$pkgver.tar.gz
|
||||
external-xsettings.patch
|
||||
libmb.pc.in.patch"
|
||||
depends="pango glib jpeg libpng libx11 libxext libxft libxsettings libxsettings-client"
|
||||
makedepends="autoconf automake libtool libx11-dev libxext-dev libxft-dev pango-dev doxygen libjpeg-turbo-dev libxsettings-dev libxsettings-client-dev"
|
||||
subpackages="$pkgname-dev $pkgname-dbg"
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
|
||||
build() {
|
||||
@ -27,9 +28,12 @@ build() {
|
||||
--enable-pango \
|
||||
--enable-doxygen-docs \
|
||||
--enable-jpeg \
|
||||
--enable-unit-tests
|
||||
--enable-unit-tests \
|
||||
--enable-debug \
|
||||
LIBS="-lXsettings-client -lX11"
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "$builddir"
|
||||
make check
|
||||
@ -39,4 +43,7 @@ package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
sha512sums="28392757960a41272e3ac32b8698549be6ee923a79f17a3b648abd59efcf5bda3eaa6de18337e1920a5ca602d7c8f3031c5418a4ce44d6c39376c70aeb49267a libmatchbox-1.12.tar.gz"
|
||||
|
||||
sha512sums="28392757960a41272e3ac32b8698549be6ee923a79f17a3b648abd59efcf5bda3eaa6de18337e1920a5ca602d7c8f3031c5418a4ce44d6c39376c70aeb49267a libmatchbox-1.12.tar.gz
|
||||
d13c3cea22bdb99ea14ec39bad0eac48278cec4d5b013e97dfff7c431160d31bd6b0e048f72816fbc367b232c0f2b7da7ef747058b8e373514831199d0a34103 external-xsettings.patch
|
||||
c548b4bc8ff9a596233d46b72b7c4fc8cd942f93f34edf521175ff38423772952d1a1bf4218f2d6319cc912a86908f233b2d7e40c6878db378f52f5557309501 libmb.pc.in.patch"
|
||||
|
||||
1084
matchbox/libmatchbox/external-xsettings.patch
Normal file
1084
matchbox/libmatchbox/external-xsettings.patch
Normal file
File diff suppressed because it is too large
Load Diff
14
matchbox/libmatchbox/libmb.pc.in.patch
Normal file
14
matchbox/libmatchbox/libmb.pc.in.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -Naur a/libmb.pc.in b/libmb.pc.in
|
||||
--- a/libmb.pc.in 2016-07-08 11:15:21.000000000 +0100
|
||||
+++ b/libmb.pc.in 2018-05-08 04:24:57.673377262 +0100
|
||||
@@ -7,6 +7,8 @@
|
||||
Description: Utility Library used by Matchbox utilities.
|
||||
Version: @VERSION@
|
||||
|
||||
-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
|
||||
-Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
|
||||
+Requires.private: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
|
||||
+Requires: libxsettings-client
|
||||
+Libs: -L${libdir} -lmb
|
||||
+Libs.private: @MB_EXTRA_LIBS@
|
||||
Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
|
||||
@ -32,6 +32,7 @@ build() {
|
||||
--localstatedir=/var
|
||||
make LIBS=-lX11
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
@ -19,10 +19,12 @@ dev () {
|
||||
mkdir -p "$subpkgdir"/usr
|
||||
make PREFIX="/usr" DESTDIR="$subpkgdir" install-devel
|
||||
}
|
||||
|
||||
build () {
|
||||
cd "$builddir"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make PREFIX="/usr" DESTDIR="$pkgdir" install
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
pkgname=matchbox-common
|
||||
pkgver=0_git20070606
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
_commit=3055fb158054d059e9a50141e7ded2a41ecfbd47
|
||||
pkgdesc="Common data files for Matchbox"
|
||||
url="http://matchbox-project.org"
|
||||
@ -10,13 +10,14 @@ 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"
|
||||
source="https://git.yoctoproject.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$_commit.tar.gz
|
||||
matchbox-v2-utils.patch"
|
||||
builddir="$srcdir/$pkgname-$_commit"
|
||||
options="!check"
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
./autogen.sh
|
||||
autoreconf --install
|
||||
./configure \
|
||||
--build=$CBUILD \
|
||||
--host=$CHOST \
|
||||
@ -26,8 +27,11 @@ build() {
|
||||
--localstatedir=/var
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
sha512sums="742c38c60efa99de6a7d9bf510045eaf8ea1038722c9e45d614b66a3112f2b48f715d53bf9d44f173ca35e858aee135d0fbc3ed4fe0937b74c40ac515c5320f4 matchbox-common-3055fb158054d059e9a50141e7ded2a41ecfbd47.tar.gz"
|
||||
|
||||
sha512sums="742c38c60efa99de6a7d9bf510045eaf8ea1038722c9e45d614b66a3112f2b48f715d53bf9d44f173ca35e858aee135d0fbc3ed4fe0937b74c40ac515c5320f4 matchbox-common-3055fb158054d059e9a50141e7ded2a41ecfbd47.tar.gz
|
||||
dc96692d51803d71288e030757ad6f597ffffb107a57d7fc51d6dea3a1eabd5736535164ec33d86effff4891e38aa30ea5ee33a1e68c58683204cf1b220721d7 matchbox-v2-utils.patch"
|
||||
|
||||
43
matchbox/matchbox-common/matchbox-v2-utils.patch
Normal file
43
matchbox/matchbox-common/matchbox-v2-utils.patch
Normal file
@ -0,0 +1,43 @@
|
||||
diff -Naur a/matchbox-session b/matchbox-session
|
||||
--- a/matchbox-session 2007-06-06 12:30:47.000000000 +0100
|
||||
+++ b/matchbox-session 2018-05-09 17:30:48.556398420 +0100
|
||||
@@ -4,21 +4,24 @@
|
||||
#
|
||||
|
||||
# Uncomment below to enable parsing of debian menu entrys
|
||||
-# export MB_USE_DEB_MENUS=1
|
||||
-
|
||||
-if [ -e $HOME/.matchbox/session ]
|
||||
-then
|
||||
-exec $HOME/.matchbox/session
|
||||
-fi
|
||||
-
|
||||
-if [ -e /etc/matchbox/session ]
|
||||
-then
|
||||
-exec /etc/matchbox/session
|
||||
-fi
|
||||
-
|
||||
+# export MB_USE_DEB_MENUS=1
|
||||
+#
|
||||
+# if [ -e $HOME/.matchbox/session ]
|
||||
+# then
|
||||
+# exec $HOME/.matchbox/session
|
||||
+# fi
|
||||
+#
|
||||
+# if [ -e /etc/matchbox/session ]
|
||||
+# then
|
||||
+# exec /etc/matchbox/session
|
||||
+# fi
|
||||
+#
|
||||
# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
|
||||
-# dont exist.
|
||||
+# dont exist.
|
||||
+
|
||||
+START_APPLETS=showdesktop,windowselector
|
||||
+END_APPLETS=clock,keyboard,systray,startup-notify,notify
|
||||
|
||||
matchbox-desktop &
|
||||
-matchbox-panel --orientation south &
|
||||
-exec matchbox-window-manager $@
|
||||
+matchbox-panel --edge=bottom --start-applets=$START_APPLETS --end-applets=$END_APPLETS &
|
||||
+exec matchbox-window-manager-2-simple -use_cursor yes $@
|
||||
@ -1,25 +0,0 @@
|
||||
Description: FTBFS with binutils-gold (#555587)
|
||||
Author: Bhavani Shankar R <bhavi@ubuntu.com>
|
||||
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 \
|
||||
@ -1,22 +1,20 @@
|
||||
# Contributor: Duncan Guthrie <dguthrie@posteo.net>
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
pkgname=matchbox-desktop
|
||||
pkgver=0.9.1_git20050406
|
||||
pkgver=2.0
|
||||
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"
|
||||
source="http://http.debian.net/debian/pool/main/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz"
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
options="!check"
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
./autogen.sh
|
||||
./configure \
|
||||
--enable-startup-notification \
|
||||
--enable-dnotify \
|
||||
@ -25,7 +23,8 @@ build() {
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var
|
||||
--localstatedir=/var \
|
||||
LIBS="-lX11"
|
||||
make
|
||||
}
|
||||
|
||||
@ -34,4 +33,4 @@ package() {
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
|
||||
sha512sums="ca4cafe4c0c14d6a60bc16e302a3eb623371357abcd168ceaaa78c15334d32351382d6e56919b1fd6c1de274e2cd9d08648c0ab4a385e8c62ec38b6c8c6a86a4 matchbox-desktop-525e271308bd21307abaf2c972610219351edff5.tar.gz"
|
||||
sha512sums="c1e4b4312a21691b9fe6f956e788d6064835bf062d69944b0124f7c274464b13320d8b8641315fe0c355eb5e35f8f42c9b817232f4aedf443a7bf34cb047f725 matchbox-desktop_2.0.orig.tar.gz"
|
||||
|
||||
@ -2,18 +2,25 @@
|
||||
# Maintainer: drebrez <drebrez@gmail.com>
|
||||
pkgname=matchbox-keyboard
|
||||
pkgver=0.1.1
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="An on screen virtual keyboard"
|
||||
url="http://matchbox-project.org/"
|
||||
arch="all"
|
||||
license="GPL-2.0-only"
|
||||
depends="libfakekey libxft"
|
||||
makedepends="autoconf automake libtool libxft-dev libxtst-dev"
|
||||
depends="libfakekey libxft cairo gtk+3.0 libx11 libxrender"
|
||||
makedepends="autoconf automake libtool libxft-dev libxtst-dev cairo-dev gtk+3.0-dev matchbox-panel-dev libx11-dev libxrender-dev"
|
||||
source="$pkgname-$pkgver.tar.bz2::http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-keyboard/snapshot/matchbox-keyboard-$pkgver.tar.bz2"
|
||||
options="!check"
|
||||
|
||||
build() {
|
||||
./autogen.sh
|
||||
./configure --prefix=/usr
|
||||
autoreconf --install
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--enable-cairo \
|
||||
--enable-applet \
|
||||
--enable-gtk2-im \
|
||||
--enable-gtk3-im \
|
||||
LDFLAGS="-lXrender -lX11"
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
Description: Fix FTBFS with binutils-gold (#555590)
|
||||
Author: Bhavani Shankar R <bhavi@ubuntu.com>
|
||||
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/
|
||||
@ -1,34 +0,0 @@
|
||||
# Contributor: Duncan Guthrie <dguthrie@posteo.net>
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
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"
|
||||
@ -1,18 +1,21 @@
|
||||
# Contributor: Duncan Guthrie <dguthrie@posteo.net>
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
pkgname=matchbox-panel
|
||||
pkgver=0_git20100816
|
||||
_pkgname=$pkgname-2
|
||||
pkgver=2.11_git20161123
|
||||
pkgrel=0
|
||||
_commit=886605280c1032f76e382f68f9a1d2e57012f4db
|
||||
pkgdesc="Simple GTK+2-based panel for handheld devices"
|
||||
_commit=f82ca3f42510fb3ef10f598b393eb373a2c34ca7
|
||||
pkgdesc="Simple GTK+3-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"
|
||||
license="GPL-2.0-or-later"
|
||||
depends="libmatchbox startup-notification libx11 libxext matchbox-common dbus dbus-glib gdk-pixbuf gtk+3.0"
|
||||
makedepends="libintl libmatchbox-dev startup-notification-dev libx11-dev autoconf automake libtool gettext git gdk-pixbuf-dev gtk+3.0-dev dbus-glib-dev dbus-dev"
|
||||
source="https://git.yoctoproject.org/cgit/cgit.cgi/${_pkgname}/snapshot/${_pkgname}-${_commit}.tar.gz
|
||||
allow-smaller-icons.patch"
|
||||
builddir="$srcdir/$_pkgname-$_commit"
|
||||
options="!check"
|
||||
subpackages="$pkgname-dev"
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
@ -25,7 +28,7 @@ build() {
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var \
|
||||
--enable-startup-notification \
|
||||
--enable-expat
|
||||
--enable-dbus
|
||||
make
|
||||
}
|
||||
|
||||
@ -34,4 +37,5 @@ package() {
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
sha512sums="6a5d9bdd612d7149e9852f9b3672fb39248fc116a0a74e0680ced67e6ca784a1596ebf3ec62a8657d44a7056e0d9781f303461e6c8cea442935da50918fff04e matchbox-panel-886605280c1032f76e382f68f9a1d2e57012f4db.tar.gz"
|
||||
sha512sums="faf5d3cb25a8cc88656099986e3f44b6f8d7fbd16ea510ca2bab04b40bd3e82304604dd4214d1015e6f14a396d442a8adac0436ea4f1745174178665bcb1f299 matchbox-panel-2-f82ca3f42510fb3ef10f598b393eb373a2c34ca7.tar.gz
|
||||
b4ec412a269565d8eb426d339c68e13ae839700658b4654ae32fbd53ad53bd3948647fe84cb59051e1fe1517f5dbd69f1cbda255278f51107a5c444780680ef7 allow-smaller-icons.patch"
|
||||
|
||||
34
matchbox/matchbox-panel/allow-smaller-icons.patch
Normal file
34
matchbox/matchbox-panel/allow-smaller-icons.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From f83a9179696b2d060ee4860733dafbf38bbd4b87 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Wed, 28 Sep 2016 15:05:41 +0300
|
||||
Subject: [PATCH] applets/systray: Allow icons to be smaller
|
||||
|
||||
Don't expand/fill the systray items, align them in the center of the
|
||||
systray panel. This makes sure the icons are drawn at the size they
|
||||
expect.
|
||||
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Upstream-Status: Submitted
|
||||
---
|
||||
applets/systray/systray.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/applets/systray/systray.c b/applets/systray/systray.c
|
||||
index 39698a8..94a5753 100644
|
||||
--- a/applets/systray/systray.c
|
||||
+++ b/applets/systray/systray.c
|
||||
@@ -29,8 +29,9 @@ on_realize (GtkWidget *widget, gpointer user_data)
|
||||
tray = (GtkWidget *)na_tray_new_for_screen (screen, orientation);
|
||||
|
||||
gtk_widget_show (tray);
|
||||
-
|
||||
- gtk_container_add (GTK_CONTAINER (widget), tray);
|
||||
+ gtk_widget_set_valign (tray, GTK_ALIGN_CENTER);
|
||||
+ gtk_widget_set_halign (tray, GTK_ALIGN_CENTER);
|
||||
+ gtk_box_pack_start (GTK_BOX (widget), tray, FALSE, FALSE, 0);
|
||||
}
|
||||
|
||||
G_MODULE_EXPORT GtkWidget *
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
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
|
||||
@ -1,12 +0,0 @@
|
||||
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])
|
||||
@ -1,113 +0,0 @@
|
||||
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 @@
|
||||
<?xml version="1.0"?>
|
||||
-<theme name="Default" author="Nokia"
|
||||
+<theme name="Default" author="Matthew Allum - mallum@handhelds.org"
|
||||
desc="" version="1.0" engine_version="1" >
|
||||
|
||||
<color id="white" def="#ffffff" />
|
||||
@@ -31,37 +31,55 @@
|
||||
<pixmap id="closebutton" filename="closebutton.xpm" />
|
||||
<pixmap id="menubutton" filename="menubutton.xpm" />
|
||||
|
||||
+<frame id="main" height="20">
|
||||
|
||||
+ <layer x="0" y="0" w="100%" h="100%"
|
||||
+ type="plain" color="borderdark" />
|
||||
+
|
||||
+ <layer x="1" y="1" w="100%-2" h="1"
|
||||
+ type="plain" color="borderlight" />
|
||||
+
|
||||
+ <layer x="1" y="2" w="100%-2" h="13"
|
||||
+ type="gradient-vert" startcol="grad1" endcol="grad2"/>
|
||||
+
|
||||
+ <layer x="1" y="2" w="100%-2" h="17"
|
||||
+ type="plain" color="grad3"/>
|
||||
|
||||
-<!-- Main windows title bar. You need to define its height -->
|
||||
-<frame id="main" height="60">
|
||||
+ <layer x="22" y="3" w="100%-44" h="14"
|
||||
+ type="plain" color="menuhl"/>
|
||||
|
||||
- <layer x="0" y="0" w="720" h="60"
|
||||
- type="plain" color="borderdark"/>
|
||||
+ <layer x="22" y="3" w="1" h="1" type="plain" color="grad3"/>
|
||||
+ <layer x="22" y="16" w="1" h="1" type="plain" color="grad3"/>
|
||||
+ <layer x="100%-23" y="3" w="1" h="1" type="plain" color="grad3"/>
|
||||
+ <layer x="100%-23" y="16" w="1" h="1" type="plain" color="grad3"/>
|
||||
|
||||
- <layer x="35" y="12" w="283" h="30"
|
||||
- type="label" color="textcol" justify="left" font="titlefont" />
|
||||
+ <layer x="1" y="19" w="2" h="1"
|
||||
+ type="plain" color="grad3" />
|
||||
+
|
||||
+ <layer x="100%-3" y="19" w="2" h="1"
|
||||
+ type="plain" color="grad3" />
|
||||
|
||||
- <!-- Define the area that launches application menu -->
|
||||
- <button x="3" y="0" w="315" h="60" action="custom" options="inputonly,pressonly" />
|
||||
+ <!-- <layer x="6" y="2" w="16" h="16" type="icon" />-->
|
||||
|
||||
- <!-- Define the status bar applet panel -->
|
||||
- <panel x="-372" y="2" w="280" h="40" />
|
||||
+ <layer x="26" y="3" w="100%-60" h="20"
|
||||
+ type="label" color="textcol" justify="left" font="titlefont" />
|
||||
|
||||
- <!-- Define minimize and close buttons -->
|
||||
- <button x="-80" y="2" w="40" h="40" action="minimize" >
|
||||
- <active pixmap="closebutton" blend="-150"/>
|
||||
- <inactive pixmap="closebutton"/>
|
||||
+
|
||||
+ <button x="100%-20" y="0" w="16" h="20" action="close" >
|
||||
+ <active pixmap="closebutton" blend="-150"/>
|
||||
+ <inactive pixmap="closebutton" />
|
||||
</button>
|
||||
|
||||
- <button x="-40" y="2" w="40" h="40" action="close" >
|
||||
- <active pixmap="menubutton" blend="-150" />
|
||||
- <inactive pixmap="menubutton"/>
|
||||
+ <button x="4" y="0" w="16" h="20" action="menu" >
|
||||
+ <active pixmap="menubutton" blend="-150"/>
|
||||
+ <inactive pixmap="menubutton" />
|
||||
</button>
|
||||
|
||||
- </frame>
|
||||
+ <button x="labelx" y="0" w="labelw" h="20"
|
||||
+ action="menu" options="inputonly" /> -
|
||||
+
|
||||
+</frame>
|
||||
|
||||
- <!--
|
||||
<frame id="main-east" width="4" >
|
||||
|
||||
<layer x="0" y="0" w="100%" h="100%"
|
||||
@@ -100,7 +118,6 @@
|
||||
type="plain" color="borderlight" />
|
||||
|
||||
</frame>
|
||||
--->
|
||||
|
||||
<frame id="dialog" height="20" >
|
||||
|
||||
@@ -244,7 +261,7 @@
|
||||
|
||||
</frame>
|
||||
|
||||
-<!--
|
||||
+
|
||||
<frame id="menu"
|
||||
border_north="2"
|
||||
border_south="3"
|
||||
@@ -268,7 +285,7 @@
|
||||
type="plain" color="trans" />
|
||||
|
||||
</frame>
|
||||
--->
|
||||
+
|
||||
<shadow style="simple" dx="3" dy="3" color="shadowcol"/>
|
||||
|
||||
-</theme>
|
||||
+</theme>
|
||||
\ No newline at end of file
|
||||
@ -1,15 +0,0 @@
|
||||
Description: Install all themes
|
||||
--- a/matchbox-window-manager/configure.ac
|
||||
+++ b/matchbox-window-manager/configure.ac
|
||||
@@ -501,7 +501,11 @@
|
||||
src/Makefile
|
||||
data/Makefile
|
||||
data/themes/Makefile
|
||||
+data/themes/blondie/Makefile
|
||||
+data/themes/bluebox/Makefile
|
||||
+data/themes/borillo/Makefile
|
||||
data/themes/Default/Makefile
|
||||
+data/themes/MBOpus/Makefile
|
||||
data/schemas/Makefile
|
||||
])
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
Description: Fix FTBFS with binutils-gold
|
||||
Add -lX11, -lXext, -lXsettings-client to LDADD settings. Closes: #555591.
|
||||
|
||||
Author: Moray Allan <moray@debian.org>
|
||||
Bug-Debian: http://bugs.debian.org/555591
|
||||
--- a/matchbox-window-manager/src/Makefile.am
|
||||
+++ b/matchbox-window-manager/src/Makefile.am
|
||||
@@ -16,11 +16,11 @@
|
||||
|
||||
INCLUDES = -DDATADIR=\"$(DATADIR)\" -DCONFDIR=\"$(CONFDIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(LIBMB_CFLAGS) $(COMPO_CFLAGS) $(EXPAT_CFLAGS) $(SN_CFLAGS) $(GCONF_CFLAGS) $(XFIXES_CFLAGS) $(XCURSOR_CFLAGS)
|
||||
|
||||
-matchbox_remote_LDADD = $(LIBMB_LIBS)
|
||||
+matchbox_remote_LDADD = $(LIBMB_LIBS) -lX11 -lXext -lXsettings-client
|
||||
|
||||
matchbox_remote_SOURCES = matchbox-remote.c
|
||||
|
||||
-matchbox_window_manager_LDADD = $(LIBMB_LIBS) $(COMPO_LIBS) $(EXPAT_LIBS) $(SN_LIBS) $(GCONF_LIBS) $(XFIXES_LIBS) $(XCURSOR_LIBS)
|
||||
+matchbox_window_manager_LDADD = $(LIBMB_LIBS) $(COMPO_LIBS) $(EXPAT_LIBS) $(SN_LIBS) $(GCONF_LIBS) $(XFIXES_LIBS) $(XCURSOR_LIBS) -lX11 -lXext -lXsettings-client
|
||||
|
||||
matchbox_window_manager_SOURCES = \
|
||||
main.c structs.h wm.c wm.h \
|
||||
@ -1,62 +0,0 @@
|
||||
Description: Fix typo and tidy program help text.
|
||||
|
||||
--- matchbox-window-manager-1.2-osso21.orig/matchbox-window-manager/src/wm.c
|
||||
+++ matchbox-window-manager-1.2-osso21/matchbox-window-manager/src/wm.c
|
||||
@@ -194,7 +194,7 @@ wm_usage(char *progname)
|
||||
printf("\t-use_dialog_mode <free|static|const-horiz>\n");
|
||||
printf("\t-use_desktop_mode <decorated|plain>\n");
|
||||
printf("\t-use_super_modal <yes|no>\n");
|
||||
- printf("\t-force_dialogs <comma seperated list of window titles>\n");
|
||||
+ printf("\t-force_dialogs <comma separated list of window titles>\n");
|
||||
#ifndef NO_KBD
|
||||
printf("\t-kbdconfig <path to option key shortcuts config file>\n");
|
||||
#endif
|
||||
@@ -203,7 +203,7 @@ wm_usage(char *progname)
|
||||
#endif
|
||||
|
||||
#ifdef STANDALONE
|
||||
- printf("\t-titlebar_panel <x11 geometry>\n");
|
||||
+ printf("\t-titlebar_panel <X11 geometry>\n");
|
||||
#endif
|
||||
printf("\n");
|
||||
printf("Compile time features;\n");
|
||||
@@ -244,15 +244,15 @@ wm_usage(char *progname)
|
||||
#endif
|
||||
|
||||
#ifdef MB_HAVE_JPEG
|
||||
- printf("\tJPG support yes\n");
|
||||
+ printf("\tJPEG support yes\n");
|
||||
#else
|
||||
- printf("\tJPG support no\n");
|
||||
+ printf("\tJPEG support no\n");
|
||||
#endif
|
||||
|
||||
#ifdef MB_HAVE_PANGO
|
||||
- printf("\tpango support yes\n");
|
||||
+ printf("\tPango support yes\n");
|
||||
#else
|
||||
- printf("\tpango support no\n");
|
||||
+ printf("\tPango support no\n");
|
||||
#endif
|
||||
|
||||
#ifndef STANDALONE
|
||||
@@ -268,15 +268,15 @@ wm_usage(char *progname)
|
||||
#endif
|
||||
|
||||
#ifdef USE_COMPOSITE
|
||||
- printf("\tcomposite support yes\n");
|
||||
+ printf("\tComposite support yes\n");
|
||||
#else
|
||||
- printf("\tcomposite support no\n");
|
||||
+ printf("\tComposite support no\n");
|
||||
#endif
|
||||
|
||||
#ifndef NO_PING
|
||||
- printf("\tping protocol support yes\n");
|
||||
+ printf("\tPing protocol support yes\n");
|
||||
#else
|
||||
- printf("\tping protocol support no\n");
|
||||
+ printf("\tPing protocol support no\n");
|
||||
#endif
|
||||
|
||||
#ifndef NO_XRM
|
||||
@ -1,28 +1,23 @@
|
||||
# Contributor: Duncan Guthrie <dguthrie@posteo.net>
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
pkgname=matchbox-window-manager
|
||||
pkgver=1.2
|
||||
_pkgrel=osso21
|
||||
_pkgname=$pkgname-2
|
||||
pkgver=2.0_git20171119
|
||||
pkgrel=0
|
||||
_pkgver=$pkgver-$_pkgrel
|
||||
pkgdesc="Window manager intended for non-desktop embedded platforms such as handhelds and set-top boxes"
|
||||
_commit=5f44595c66be118b1a74f489de7f8492035cbdf0
|
||||
pkgdesc="Window manager intended for non-desktop embedded platforms such as handhelds and set-top boxes"
|
||||
url="http://matchbox-project.org"
|
||||
arch="all"
|
||||
license="GPL-2.0-only"
|
||||
depends="libxsettings-client libmatchbox startup-notification libpng expat libx11 libxext jpeg"
|
||||
makedepends="expat-dev autoconf automake libtool libmatchbox-dev libx11-dev libxext-dev libxt-dev libxft-dev gconf-dev libxsettings-dev libxsettings-client-dev startup-notification-dev jpeg-dev"
|
||||
source="${pkgname}_${_pkgver}.orig.tar.gz::http://http.debian.net/debian/pool/main/m/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz
|
||||
01-build-themes.patch
|
||||
02-config.patch
|
||||
03-default-theme.patch
|
||||
04-install-themes.patch
|
||||
05-makefile.patch
|
||||
06-tidy-help-text.patch"
|
||||
builddir="$srcdir/$pkgname-$pkgver/"
|
||||
source="https://git.yoctoproject.org/cgit/cgit.cgi/${_pkgname}/snapshot/${_pkgname}-${_commit}.tar.gz
|
||||
libpng.pc.patch"
|
||||
depends="libmatchbox libpng expat gtk+2.0 pango"
|
||||
makedepends="expat-dev autoconf automake libtool libmatchbox-dev libpng-dev expat-dev gtk+2.0-dev pango-dev"
|
||||
builddir="$srcdir/$_pkgname-$_commit"
|
||||
options="!check"
|
||||
|
||||
build() {
|
||||
cd "$builddir/$pkgname"
|
||||
cd "$builddir"
|
||||
autoreconf --install
|
||||
./configure \
|
||||
--build=$CBUILD \
|
||||
@ -30,19 +25,16 @@ build() {
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/ \
|
||||
--enable-startup-notification \
|
||||
--enable-expat \
|
||||
--with-gtk \
|
||||
--with-pango \
|
||||
LIBS="-lexpat"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir/$pkgname"
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
sha512sums="65fa98288dc98f3c68ba2a2159957ef22afa00382bfb7bb759ce2fbed38cd2b5c24eac706f47823c85c516dc960e326d38df3bc3077a12890c58376e6f4ae717 matchbox-window-manager_1.2-osso21.orig.tar.gz
|
||||
874caea7009095cbdd5c3f8c3634921e74e7866546d597fb3d6ed2180afeef52c7ff76ebb8eaed3339fdae2b999e20892e758602fd36f176905a70f3965851a6 01-build-themes.patch
|
||||
1a2b3c1800fa0a1e32521552a44cac058ec18ec0d2e3cd791312bd9c3687b90dfe678aa9274790948dee7aa13e61fefb5e1eaa589926cefa38138295938a03bf 02-config.patch
|
||||
c4f1c68602f8e5cfe4c432de4afdcfce4fb54f402ad2a0cf7ccbe50acfe57ac30582e3f8832df0726a1f2f1900a5ad1215e3317d49800766a44dcb241fc21d88 03-default-theme.patch
|
||||
a0c9ac95a38c1d793b85e51d022317f6b840f5913c3bc46d32c981612a759488bf89b68fcb4851aa7f4ff9c61d328018f5b9a047929a6e13333708e919c43ef5 04-install-themes.patch
|
||||
8ed4217371f1ddbf45b457d94ea953b36a253e557e834f405ed29d72bbcda3309719b58ea04999eccaa30629b9dced44a3f290f81ffeb40498577d10308a1bc9 05-makefile.patch
|
||||
d32452203c6534d6d673962ed83ba70c03e3a7eedd9bef66e111e08466331103539c07edb89605f134bd7c427f6a221cbd42243d5d410c57c0cab61b9344b98b 06-tidy-help-text.patch"
|
||||
sha512sums="5972c9304de064501f657e3fc7920b4fd25dec24db609442e340dbe1850dd48b5cc9abaca1ad175cbb52fdede180f12b522ab0e8c028f12a1bd691710f15d5f3 matchbox-window-manager-2-5f44595c66be118b1a74f489de7f8492035cbdf0.tar.gz
|
||||
76e0af420f81ce6af545e3f42cb3deb73378dc10db21e6f4eb0e4baddb9c617366d3409bccf3c9b5a14e76e54401a90270ec6a720e16175452736a4ce497b818 libpng.pc.patch"
|
||||
|
||||
12
matchbox/matchbox-window-manager/libpng.pc.patch
Normal file
12
matchbox/matchbox-window-manager/libpng.pc.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Naur a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2018-05-06 23:55:16.363969631 +0100
|
||||
+++ b/configure.ac 2018-05-07 00:03:30.842077995 +0100
|
||||
@@ -96,7 +96,7 @@
|
||||
fi
|
||||
|
||||
if test "x$png_theme" = "xyes"; then
|
||||
- needed_pkgs="$needed_pkgs libpng12 "
|
||||
+ needed_pkgs="$needed_pkgs libpng16 "
|
||||
fi
|
||||
|
||||
if test "x$composite_managers" != xno -a \
|
||||
@ -1,35 +0,0 @@
|
||||
# Contributor: Duncan Guthrie <dguthrie@posteo.net>
|
||||
# Maintainer: Duncan Guthrie <dguthrie@posteo.net>
|
||||
pkgname=mb-applet-input-manager
|
||||
pkgver=0_git20051017
|
||||
pkgrel=0
|
||||
_commit=844b360d74f4ae6a1cc20cb32bb205c03c94ae2b
|
||||
pkgdesc="Tray application for Matchbox to manage software-based input methods"
|
||||
url="http://matchbox-project.org"
|
||||
arch="all"
|
||||
license="GPL-2.0-only"
|
||||
depends="libmatchbox libjpeg-turbo"
|
||||
makedepends="autoconf automake libtool libmatchbox-dev 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"
|
||||
./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="11ed89735e90a476c2310d2bf3ebcead71cdb1427ee1475c77f83d5891ec2e74f944817d5a7753d141138e95931cc7ee52aa9c89ab456318a3679c713622aa7b mb-applet-input-manager-844b360d74f4ae6a1cc20cb32bb205c03c94ae2b.tar.gz"
|
||||
Loading…
Reference in New Issue
Block a user