diff --git a/main/postmarketos-ui-matchbox/60-lightdm-autologin.conf b/main/postmarketos-ui-matchbox/60-lightdm-autologin.conf deleted file mode 100644 index 52cf58853..000000000 --- a/main/postmarketos-ui-matchbox/60-lightdm-autologin.conf +++ /dev/null @@ -1,5 +0,0 @@ -# This file gets removed with postmarketos-ui-matchbox, even if modified! -[Seat:*] -autologin-user=username -autologin-user-timeout=0 -autologin-session=matchbox diff --git a/main/postmarketos-ui-matchbox/APKBUILD b/main/postmarketos-ui-matchbox/APKBUILD deleted file mode 100644 index 76437a273..000000000 --- a/main/postmarketos-ui-matchbox/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=postmarketos-ui-matchbox -pkgver=1 -pkgrel=5 -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-desktop matchbox-keyboard matchbox-window-manager xterm xorg-server dbus-x11 mesa-egl gtk+2.0 lightdm-openrc" -install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" -source="matchbox.desktop 60-lightdm-autologin.conf" -options="!check" - -package() { - install -Dm644 "$srcdir"/matchbox.desktop \ - "$pkgdir"/usr/share/xsessions/matchbox.desktop - - install -Dm644 "$srcdir"/60-lightdm-autologin.conf \ - "$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf -} - -sha512sums="1ceae6d4939cdddf14602471f52cf409e4094a81718ef5d7ea83adf5bf3d7ca8d13e15b8a98f99dee54bb8703038ea31abd74ad1fbe8d2c752d5f1a56310f508 matchbox.desktop -366a75dc36b123f184e4a9296784b22fe1b64de278c508e19536c150b44536b653ae819ca449d53f430fb88f9d853e10a2b64dc7aeb39d93ee763b67a13d7e1d 60-lightdm-autologin.conf" diff --git a/main/postmarketos-ui-matchbox/matchbox.desktop b/main/postmarketos-ui-matchbox/matchbox.desktop deleted file mode 100644 index 9dd99ae7d..000000000 --- a/main/postmarketos-ui-matchbox/matchbox.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Matchbox -Name[en]=Matchbox -Comment=This session logs you into Matchbox -Comment[en]=This session logs you into Matchbox -Exec=matchbox-session -TryExec=matchbox-session -Icon= -Type=Application -DesktopNames=Matchbox -Keywords=launch;Matchbox;desktop;session; diff --git a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-deinstall b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-deinstall deleted file mode 100644 index 48d6f9835..000000000 --- a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rm /usr/share/lightdm/lightdm.conf.d/60-autologin.conf diff --git a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-install b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-install deleted file mode 100644 index a7791b1e4..000000000 --- a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf - -rc-update add lightdm default diff --git a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade deleted file mode 100644 index a7791b1e4..000000000 --- a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf - -rc-update add lightdm default diff --git a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.pre-deinstall b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.pre-deinstall deleted file mode 100644 index c815bf5fd..000000000 --- a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.pre-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rc-update del lightdm diff --git a/matchbox/libmatchbox/APKBUILD b/matchbox/libmatchbox/APKBUILD deleted file mode 100644 index fcf05ea2b..000000000 --- a/matchbox/libmatchbox/APKBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Contributor: Duncan Guthrie -# Maintainer: Duncan Guthrie -pkgname=libmatchbox -pkgver=1.12 -pkgrel=1 -pkgdesc="Library for matchbox window manager" -url="http://matchbox-project.org" -arch="all" -license="GPL-2.0-only" -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() { - 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 \ - --enable-debug \ - LIBS="-lXsettings-client -lX11" - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="28392757960a41272e3ac32b8698549be6ee923a79f17a3b648abd59efcf5bda3eaa6de18337e1920a5ca602d7c8f3031c5418a4ce44d6c39376c70aeb49267a libmatchbox-1.12.tar.gz -d13c3cea22bdb99ea14ec39bad0eac48278cec4d5b013e97dfff7c431160d31bd6b0e048f72816fbc367b232c0f2b7da7ef747058b8e373514831199d0a34103 external-xsettings.patch -c548b4bc8ff9a596233d46b72b7c4fc8cd942f93f34edf521175ff38423772952d1a1bf4218f2d6319cc912a86908f233b2d7e40c6878db378f52f5557309501 libmb.pc.in.patch" diff --git a/matchbox/libmatchbox/external-xsettings.patch b/matchbox/libmatchbox/external-xsettings.patch deleted file mode 100644 index b2d0ce507..000000000 --- a/matchbox/libmatchbox/external-xsettings.patch +++ /dev/null @@ -1,1084 +0,0 @@ -diff -Naur a/libmb/Makefile.am b/libmb/Makefile.am ---- a/libmb/Makefile.am 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/Makefile.am 2018-05-06 19:35:23.253712501 +0100 -@@ -6,8 +6,6 @@ - mbutil.h \ - mbexp.h \ - mbconfig.h \ -- xsettings-client.h \ -- xsettings-common.h \ - hash.h - - source_c = mbmenu.c \ -@@ -16,8 +14,6 @@ - mbpixbuf.c \ - mbutil.c \ - mbexp.c \ -- xsettings-client.c \ -- xsettings-common.c \ - hash.c - - DATADIR=$(datadir) -diff -Naur a/libmb/mbmenu.h b/libmb/mbmenu.h ---- a/libmb/mbmenu.h 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/mbmenu.h 2018-05-06 19:36:55.929043486 +0100 -@@ -42,7 +42,7 @@ - #include - #include - --#include -+#include - #include - #include - -diff -Naur a/libmb/mbtray.c b/libmb/mbtray.c ---- a/libmb/mbtray.c 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/mbtray.c 2018-05-06 19:38:03.306275142 +0100 -@@ -35,7 +35,7 @@ - #endif - - #include "mbtray.h" --#include "xsettings-client.h" -+#include - - #include - -diff -Naur a/libmb/xsettings-client.c b/libmb/xsettings-client.c ---- a/libmb/xsettings-client.c 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/xsettings-client.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,577 +0,0 @@ --/* -- * Copyright © 2001 Red Hat, Inc. -- * -- * Permission to use, copy, modify, distribute, and sell this software and its -- * documentation for any purpose is hereby granted without fee, provided that -- * the above copyright notice appear in all copies and that both that -- * copyright notice and this permission notice appear in supporting -- * documentation, and that the name of Red Hat not be used in advertising or -- * publicity pertaining to distribution of the software without specific, -- * written prior permission. Red Hat makes no representations about the -- * suitability of this software for any purpose. It is provided "as is" -- * without express or implied warranty. -- * -- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT -- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- * -- * Author: Owen Taylor, Red Hat, Inc. -- */ --#include --#include --#include --#include -- --#include --#include /* For CARD16 */ -- --#include "xsettings-client.h" -- --struct _XSettingsClient --{ -- Display *display; -- int screen; -- XSettingsNotifyFunc notify; -- XSettingsWatchFunc watch; -- void *cb_data; -- -- XSettingsGrabFunc grab; -- XSettingsGrabFunc ungrab; -- -- Window manager_window; -- Atom manager_atom; -- Atom selection_atom; -- Atom xsettings_atom; -- -- XSettingsList *settings; --}; -- --static void --notify_changes (XSettingsClient *client, -- XSettingsList *old_list) --{ -- XSettingsList *old_iter = old_list; -- XSettingsList *new_iter = client->settings; -- -- if (!client->notify) -- return; -- -- while (old_iter || new_iter) -- { -- int cmp; -- -- if (old_iter && new_iter) -- cmp = strcmp (old_iter->setting->name, new_iter->setting->name); -- else if (old_iter) -- cmp = -1; -- else -- cmp = 1; -- -- if (cmp < 0) -- { -- client->notify (old_iter->setting->name, -- XSETTINGS_ACTION_DELETED, -- NULL, -- client->cb_data); -- } -- else if (cmp == 0) -- { -- if (!xsettings_setting_equal (old_iter->setting, -- new_iter->setting)) -- client->notify (old_iter->setting->name, -- XSETTINGS_ACTION_CHANGED, -- new_iter->setting, -- client->cb_data); -- } -- else -- { -- client->notify (new_iter->setting->name, -- XSETTINGS_ACTION_NEW, -- new_iter->setting, -- client->cb_data); -- } -- -- if (old_iter) -- old_iter = old_iter->next; -- if (new_iter) -- new_iter = new_iter->next; -- } --} -- --static int --ignore_errors (Display *display, XErrorEvent *event) --{ -- return True; --} -- --static char local_byte_order = '\0'; -- --#define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos) -- --static XSettingsResult --fetch_card16 (XSettingsBuffer *buffer, -- CARD16 *result) --{ -- CARD16 x; -- -- if (BYTES_LEFT (buffer) < 2) -- return XSETTINGS_ACCESS; -- -- x = *(CARD16 *)buffer->pos; -- buffer->pos += 2; -- -- if (buffer->byte_order == local_byte_order) -- *result = x; -- else -- *result = (x << 8) | (x >> 8); -- -- return XSETTINGS_SUCCESS; --} -- --static XSettingsResult --fetch_ushort (XSettingsBuffer *buffer, -- unsigned short *result) --{ -- CARD16 x; -- XSettingsResult r; -- -- r = fetch_card16 (buffer, &x); -- if (r == XSETTINGS_SUCCESS) -- *result = x; -- -- return r; --} -- --static XSettingsResult --fetch_card32 (XSettingsBuffer *buffer, -- CARD32 *result) --{ -- CARD32 x; -- -- if (BYTES_LEFT (buffer) < 4) -- return XSETTINGS_ACCESS; -- -- x = *(CARD32 *)buffer->pos; -- buffer->pos += 4; -- -- if (buffer->byte_order == local_byte_order) -- *result = x; -- else -- *result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24); -- -- return XSETTINGS_SUCCESS; --} -- --static XSettingsResult --fetch_card8 (XSettingsBuffer *buffer, -- CARD8 *result) --{ -- if (BYTES_LEFT (buffer) < 1) -- return XSETTINGS_ACCESS; -- -- *result = *(CARD8 *)buffer->pos; -- buffer->pos += 1; -- -- return XSETTINGS_SUCCESS; --} -- --#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1))) -- --static XSettingsList * --parse_settings (unsigned char *data, -- size_t len) --{ -- XSettingsBuffer buffer; -- XSettingsResult result = XSETTINGS_SUCCESS; -- XSettingsList *settings = NULL; -- CARD32 serial; -- CARD32 n_entries; -- CARD32 i; -- XSettingsSetting *setting = NULL; -- -- local_byte_order = xsettings_byte_order (); -- -- buffer.pos = buffer.data = data; -- buffer.len = len; -- -- result = fetch_card8 (&buffer, (char *)&buffer.byte_order); -- if (buffer.byte_order != MSBFirst && -- buffer.byte_order != LSBFirst) -- { -- fprintf (stderr, "Invalid byte order in XSETTINGS property\n"); -- result = XSETTINGS_FAILED; -- goto out; -- } -- -- buffer.pos += 3; -- -- result = fetch_card32 (&buffer, &serial); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- result = fetch_card32 (&buffer, &n_entries); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- for (i = 0; i < n_entries; i++) -- { -- CARD8 type; -- CARD16 name_len; -- CARD32 v_int; -- size_t pad_len; -- -- result = fetch_card8 (&buffer, &type); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- buffer.pos += 1; -- -- result = fetch_card16 (&buffer, &name_len); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- pad_len = XSETTINGS_PAD(name_len, 4); -- if (BYTES_LEFT (&buffer) < pad_len) -- { -- result = XSETTINGS_ACCESS; -- goto out; -- } -- -- setting = malloc (sizeof *setting); -- if (!setting) -- { -- result = XSETTINGS_NO_MEM; -- goto out; -- } -- setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */ -- -- setting->name = malloc (name_len + 1); -- if (!setting->name) -- { -- result = XSETTINGS_NO_MEM; -- goto out; -- } -- -- memcpy (setting->name, buffer.pos, name_len); -- setting->name[name_len] = '\0'; -- buffer.pos += pad_len; -- -- result = fetch_card32 (&buffer, &v_int); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- setting->last_change_serial = v_int; -- -- switch (type) -- { -- case XSETTINGS_TYPE_INT: -- result = fetch_card32 (&buffer, &v_int); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- setting->data.v_int = (INT32)v_int; -- break; -- case XSETTINGS_TYPE_STRING: -- result = fetch_card32 (&buffer, &v_int); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- pad_len = XSETTINGS_PAD (v_int, 4); -- if (v_int + 1 == 0 || /* Guard against wrap-around */ -- BYTES_LEFT (&buffer) < pad_len) -- { -- result = XSETTINGS_ACCESS; -- goto out; -- } -- -- setting->data.v_string = malloc (v_int + 1); -- if (!setting->data.v_string) -- { -- result = XSETTINGS_NO_MEM; -- goto out; -- } -- -- memcpy (setting->data.v_string, buffer.pos, v_int); -- setting->data.v_string[v_int] = '\0'; -- buffer.pos += pad_len; -- -- break; -- case XSETTINGS_TYPE_COLOR: -- result = fetch_ushort (&buffer, &setting->data.v_color.red); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- result = fetch_ushort (&buffer, &setting->data.v_color.green); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- result = fetch_ushort (&buffer, &setting->data.v_color.blue); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- result = fetch_ushort (&buffer, &setting->data.v_color.alpha); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- break; -- default: -- /* Quietly ignore unknown types */ -- break; -- } -- -- setting->type = type; -- -- result = xsettings_list_insert (&settings, setting); -- if (result != XSETTINGS_SUCCESS) -- goto out; -- -- setting = NULL; -- } -- -- out: -- -- if (result != XSETTINGS_SUCCESS) -- { -- switch (result) -- { -- case XSETTINGS_NO_MEM: -- fprintf(stderr, "Out of memory reading XSETTINGS property\n"); -- break; -- case XSETTINGS_ACCESS: -- fprintf(stderr, "Invalid XSETTINGS property (read off end)\n"); -- break; -- case XSETTINGS_DUPLICATE_ENTRY: -- fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name); -- case XSETTINGS_FAILED: -- case XSETTINGS_SUCCESS: -- case XSETTINGS_NO_ENTRY: -- break; -- } -- -- if (setting) -- xsettings_setting_free (setting); -- -- xsettings_list_free (settings); -- settings = NULL; -- -- } -- -- return settings; --} -- --static void --read_settings (XSettingsClient *client) --{ -- Atom type; -- int format; -- unsigned long n_items; -- unsigned long bytes_after; -- unsigned char *data; -- int result; -- -- int (*old_handler) (Display *, XErrorEvent *); -- -- XSettingsList *old_list = client->settings; -- -- client->settings = NULL; -- -- if (client->manager_window) -- { -- old_handler = XSetErrorHandler (ignore_errors); -- result = XGetWindowProperty (client->display, client->manager_window, -- client->xsettings_atom, 0, LONG_MAX, -- False, client->xsettings_atom, -- &type, &format, &n_items, &bytes_after, &data); -- XSetErrorHandler (old_handler); -- -- if (result == Success && type != None) -- { -- if (type != client->xsettings_atom) -- { -- fprintf (stderr, "Invalid type for XSETTINGS property"); -- } -- else if (format != 8) -- { -- fprintf (stderr, "Invalid format for XSETTINGS property %d", format); -- } -- else -- client->settings = parse_settings (data, n_items); -- -- XFree (data); -- } -- } -- -- notify_changes (client, old_list); -- xsettings_list_free (old_list); --} -- --static void --add_events (Display *display, -- Window window, -- long mask) --{ -- XWindowAttributes attr; -- -- XGetWindowAttributes (display, window, &attr); -- XSelectInput (display, window, attr.your_event_mask | mask); --} -- --static void --check_manager_window (XSettingsClient *client) --{ -- if (client->manager_window && client->watch) -- client->watch (client->manager_window, False, 0, client->cb_data); -- -- if (client->grab) -- client->grab (client->display); -- else -- XGrabServer (client->display); -- -- client->manager_window = XGetSelectionOwner (client->display, -- client->selection_atom); -- if (client->manager_window) -- XSelectInput (client->display, client->manager_window, -- PropertyChangeMask | StructureNotifyMask); -- -- if (client->ungrab) -- client->ungrab (client->display); -- else -- XUngrabServer (client->display); -- -- XFlush (client->display); -- -- if (client->manager_window && client->watch) -- client->watch (client->manager_window, True, -- PropertyChangeMask | StructureNotifyMask, -- client->cb_data); -- -- read_settings (client); --} -- --XSettingsClient * --xsettings_client_new (Display *display, -- int screen, -- XSettingsNotifyFunc notify, -- XSettingsWatchFunc watch, -- void *cb_data) --{ -- XSettingsClient *client; -- char buffer[256]; -- char *atom_names[3]; -- Atom atoms[3]; -- -- client = malloc (sizeof *client); -- if (!client) -- return NULL; -- -- client->display = display; -- client->screen = screen; -- client->notify = notify; -- client->watch = watch; -- client->cb_data = cb_data; -- client->grab = NULL; -- client->ungrab = NULL; -- -- client->manager_window = None; -- client->settings = NULL; -- -- sprintf(buffer, "_XSETTINGS_S%d", screen); -- atom_names[0] = buffer; -- atom_names[1] = "_XSETTINGS_SETTINGS"; -- atom_names[2] = "MANAGER"; -- -- XInternAtoms (display, atom_names, 3, False, atoms); -- -- client->selection_atom = atoms[0]; -- client->xsettings_atom = atoms[1]; -- client->manager_atom = atoms[2]; -- -- /* Select on StructureNotify so we get MANAGER events -- */ -- add_events (display, RootWindow (display, screen), StructureNotifyMask); -- -- if (client->watch) -- client->watch (RootWindow (display, screen), True, StructureNotifyMask, -- client->cb_data); -- -- check_manager_window (client); -- -- return client; --} -- --void --xsettings_client_set_grab_func (XSettingsClient *client, -- XSettingsGrabFunc grab) --{ -- client->grab = grab; --} -- --void --xsettings_client_set_ungrab_func (XSettingsClient *client, -- XSettingsGrabFunc ungrab) --{ -- client->ungrab = ungrab; --} -- --void --xsettings_client_destroy (XSettingsClient *client) --{ -- if (client->watch) -- client->watch (RootWindow (client->display, client->screen), -- False, 0, client->cb_data); -- if (client->manager_window && client->watch) -- client->watch (client->manager_window, False, 0, client->cb_data); -- -- xsettings_list_free (client->settings); -- free (client); --} -- --XSettingsResult --xsettings_client_get_setting (XSettingsClient *client, -- const char *name, -- XSettingsSetting **setting) --{ -- XSettingsSetting *search = xsettings_list_lookup (client->settings, name); -- if (search) -- { -- *setting = xsettings_setting_copy (search); -- return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM; -- } -- else -- return XSETTINGS_NO_ENTRY; --} -- --Bool --xsettings_client_process_event (XSettingsClient *client, -- XEvent *xev) --{ -- /* The checks here will not unlikely cause us to reread -- * the properties from the manager window a number of -- * times when the manager changes from A->B. But manager changes -- * are going to be pretty rare. -- */ -- if (xev->xany.window == RootWindow (client->display, client->screen)) -- { -- if (xev->xany.type == ClientMessage && -- xev->xclient.message_type == client->manager_atom && -- xev->xclient.data.l[1] == client->selection_atom) -- { -- check_manager_window (client); -- return True; -- } -- } -- else if (xev->xany.window == client->manager_window) -- { -- if (xev->xany.type == DestroyNotify) -- { -- check_manager_window (client); -- return True; -- } -- else if (xev->xany.type == PropertyNotify) -- { -- read_settings (client); -- return True; -- } -- } -- -- return False; --} -diff -Naur a/libmb/xsettings-client.h b/libmb/xsettings-client.h ---- a/libmb/xsettings-client.h 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/xsettings-client.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,72 +0,0 @@ --/* -- * Copyright © 2001 Red Hat, Inc. -- * -- * Permission to use, copy, modify, distribute, and sell this software and its -- * documentation for any purpose is hereby granted without fee, provided that -- * the above copyright notice appear in all copies and that both that -- * copyright notice and this permission notice appear in supporting -- * documentation, and that the name of Red Hat not be used in advertising or -- * publicity pertaining to distribution of the software without specific, -- * written prior permission. Red Hat makes no representations about the -- * suitability of this software for any purpose. It is provided "as is" -- * without express or implied warranty. -- * -- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT -- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- * -- * Author: Owen Taylor, Red Hat, Inc. -- */ --#ifndef XSETTINGS_CLIENT_H --#define XSETTINGS_CLIENT_H -- --#include --#include "xsettings-common.h" -- --#ifdef __cplusplus --extern "C" { --#endif /* __cplusplus */ -- --typedef struct _XSettingsClient XSettingsClient; -- --typedef enum --{ -- XSETTINGS_ACTION_NEW, -- XSETTINGS_ACTION_CHANGED, -- XSETTINGS_ACTION_DELETED --} XSettingsAction; -- --typedef void (*XSettingsNotifyFunc) (const char *name, -- XSettingsAction action, -- XSettingsSetting *setting, -- void *cb_data); --typedef void (*XSettingsWatchFunc) (Window window, -- Bool is_start, -- long mask, -- void *cb_data); --typedef void (*XSettingsGrabFunc) (Display *display); -- --XSettingsClient *xsettings_client_new (Display *display, -- int screen, -- XSettingsNotifyFunc notify, -- XSettingsWatchFunc watch, -- void *cb_data); --void xsettings_client_set_grab_func (XSettingsClient *client, -- XSettingsGrabFunc grab); --void xsettings_client_set_ungrab_func (XSettingsClient *client, -- XSettingsGrabFunc ungrab); --void xsettings_client_destroy (XSettingsClient *client); --Bool xsettings_client_process_event (XSettingsClient *client, -- XEvent *xev); --XSettingsResult xsettings_client_get_setting (XSettingsClient *client, -- const char *name, -- XSettingsSetting **setting); -- --#ifdef __cplusplus --} --#endif /* __cplusplus */ -- --#endif /* XSETTINGS_CLIENT_H */ -diff -Naur a/libmb/xsettings-common.c b/libmb/xsettings-common.c ---- a/libmb/xsettings-common.c 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/xsettings-common.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,264 +0,0 @@ --/* -- * Copyright © 2001 Red Hat, Inc. -- * -- * Permission to use, copy, modify, distribute, and sell this software and its -- * documentation for any purpose is hereby granted without fee, provided that -- * the above copyright notice appear in all copies and that both that -- * copyright notice and this permission notice appear in supporting -- * documentation, and that the name of Red Hat not be used in advertising or -- * publicity pertaining to distribution of the software without specific, -- * written prior permission. Red Hat makes no representations about the -- * suitability of this software for any purpose. It is provided "as is" -- * without express or implied warranty. -- * -- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT -- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- * -- * Author: Owen Taylor, Red Hat, Inc. -- */ --#include "string.h" --#include "stdlib.h" -- --#include --#include /* For CARD32 */ -- --#include "xsettings-common.h" -- --XSettingsSetting * --xsettings_setting_copy (XSettingsSetting *setting) --{ -- XSettingsSetting *result; -- size_t str_len; -- -- result = malloc (sizeof *result); -- if (!result) -- return NULL; -- -- str_len = strlen (setting->name); -- result->name = malloc (str_len + 1); -- if (!result->name) -- goto err; -- -- memcpy (result->name, setting->name, str_len + 1); -- -- result->type = setting->type; -- -- switch (setting->type) -- { -- case XSETTINGS_TYPE_INT: -- result->data.v_int = setting->data.v_int; -- break; -- case XSETTINGS_TYPE_COLOR: -- result->data.v_color = setting->data.v_color; -- break; -- case XSETTINGS_TYPE_STRING: -- str_len = strlen (setting->data.v_string); -- result->data.v_string = malloc (str_len + 1); -- if (!result->data.v_string) -- goto err; -- -- memcpy (result->data.v_string, setting->data.v_string, str_len + 1); -- break; -- } -- -- result->last_change_serial = setting->last_change_serial; -- -- return result; -- -- err: -- if (result->name) -- free (result->name); -- free (result); -- -- return NULL; --} -- --XSettingsList * --xsettings_list_copy (XSettingsList *list) --{ -- XSettingsList *new = NULL; -- XSettingsList *old_iter = list; -- XSettingsList *new_iter = NULL; -- -- while (old_iter) -- { -- XSettingsList *new_node; -- -- new_node = malloc (sizeof *new_node); -- if (!new_node) -- goto error; -- -- new_node->setting = xsettings_setting_copy (old_iter->setting); -- if (!new_node->setting) -- { -- free (new_node); -- goto error; -- } -- -- if (new_iter) -- new_iter->next = new_node; -- else -- new = new_node; -- -- new_iter = new_node; -- -- old_iter = old_iter->next; -- } -- -- return new; -- -- error: -- xsettings_list_free (new); -- return NULL; --} -- --int --xsettings_setting_equal (XSettingsSetting *setting_a, -- XSettingsSetting *setting_b) --{ -- if (setting_a->type != setting_b->type) -- return 0; -- -- if (strcmp (setting_a->name, setting_b->name) != 0) -- return 0; -- -- switch (setting_a->type) -- { -- case XSETTINGS_TYPE_INT: -- return setting_a->data.v_int == setting_b->data.v_int; -- case XSETTINGS_TYPE_COLOR: -- return (setting_a->data.v_color.red == setting_b->data.v_color.red && -- setting_a->data.v_color.green == setting_b->data.v_color.green && -- setting_a->data.v_color.blue == setting_b->data.v_color.blue && -- setting_a->data.v_color.alpha == setting_b->data.v_color.alpha); -- case XSETTINGS_TYPE_STRING: -- return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0; -- } -- -- return 0; --} -- --void --xsettings_setting_free (XSettingsSetting *setting) --{ -- if (setting->type == XSETTINGS_TYPE_STRING) -- free (setting->data.v_string); -- -- if (setting->name) -- free (setting->name); -- -- free (setting); --} -- --void --xsettings_list_free (XSettingsList *list) --{ -- while (list) -- { -- XSettingsList *next = list->next; -- -- xsettings_setting_free (list->setting); -- free (list); -- -- list = next; -- } --} -- --XSettingsResult --xsettings_list_insert (XSettingsList **list, -- XSettingsSetting *setting) --{ -- XSettingsList *node; -- XSettingsList *iter; -- XSettingsList *last = NULL; -- -- node = malloc (sizeof *node); -- if (!node) -- return XSETTINGS_NO_MEM; -- node->setting = setting; -- -- iter = *list; -- while (iter) -- { -- int cmp = strcmp (setting->name, iter->setting->name); -- -- if (cmp < 0) -- break; -- else if (cmp == 0) -- { -- free (node); -- return XSETTINGS_DUPLICATE_ENTRY; -- } -- -- last = iter; -- iter = iter->next; -- } -- -- if (last) -- last->next = node; -- else -- *list = node; -- -- node->next = iter; -- -- return XSETTINGS_SUCCESS; --} -- --XSettingsResult --xsettings_list_delete (XSettingsList **list, -- const char *name) --{ -- XSettingsList *iter; -- XSettingsList *last = NULL; -- -- iter = *list; -- while (iter) -- { -- if (strcmp (name, iter->setting->name) == 0) -- { -- if (last) -- last->next = iter->next; -- else -- *list = iter->next; -- -- xsettings_setting_free (iter->setting); -- free (iter); -- -- return XSETTINGS_SUCCESS; -- } -- -- last = iter; -- iter = iter->next; -- } -- -- return XSETTINGS_FAILED; --} -- --XSettingsSetting * --xsettings_list_lookup (XSettingsList *list, -- const char *name) --{ -- XSettingsList *iter; -- -- iter = list; -- while (iter) -- { -- if (strcmp (name, iter->setting->name) == 0) -- return iter->setting; -- -- iter = iter->next; -- } -- -- return NULL; --} -- --char --xsettings_byte_order (void) --{ -- CARD32 myint = 0x01020304; -- return (*(char *)&myint == 1) ? MSBFirst : LSBFirst; --} -diff -Naur a/libmb/xsettings-common.h b/libmb/xsettings-common.h ---- a/libmb/xsettings-common.h 2016-07-08 11:15:21.000000000 +0100 -+++ b/libmb/xsettings-common.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,110 +0,0 @@ --/* -- * Copyright © 2001 Red Hat, Inc. -- * -- * Permission to use, copy, modify, distribute, and sell this software and its -- * documentation for any purpose is hereby granted without fee, provided that -- * the above copyright notice appear in all copies and that both that -- * copyright notice and this permission notice appear in supporting -- * documentation, and that the name of Red Hat not be used in advertising or -- * publicity pertaining to distribution of the software without specific, -- * written prior permission. Red Hat makes no representations about the -- * suitability of this software for any purpose. It is provided "as is" -- * without express or implied warranty. -- * -- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT -- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- * -- * Author: Owen Taylor, Red Hat, Inc. -- */ --#ifndef XSETTINGS_COMMON_H --#define XSETTINGS_COMMON_H -- --#ifdef __cplusplus --extern "C" { --#endif /* __cplusplus */ -- --typedef struct _XSettingsBuffer XSettingsBuffer; --typedef struct _XSettingsColor XSettingsColor; --typedef struct _XSettingsList XSettingsList; --typedef struct _XSettingsSetting XSettingsSetting; -- --/* Types of settings possible. Enum values correspond to -- * protocol values. -- */ --typedef enum --{ -- XSETTINGS_TYPE_INT = 0, -- XSETTINGS_TYPE_STRING = 1, -- XSETTINGS_TYPE_COLOR = 2 --} XSettingsType; -- --typedef enum --{ -- XSETTINGS_SUCCESS, -- XSETTINGS_NO_MEM, -- XSETTINGS_ACCESS, -- XSETTINGS_FAILED, -- XSETTINGS_NO_ENTRY, -- XSETTINGS_DUPLICATE_ENTRY --} XSettingsResult; -- --struct _XSettingsBuffer --{ -- char byte_order; -- size_t len; -- unsigned char *data; -- unsigned char *pos; --}; -- --struct _XSettingsColor --{ -- unsigned short red, green, blue, alpha; --}; -- --struct _XSettingsList --{ -- XSettingsSetting *setting; -- XSettingsList *next; --}; -- --struct _XSettingsSetting --{ -- char *name; -- XSettingsType type; -- -- union { -- int v_int; -- char *v_string; -- XSettingsColor v_color; -- } data; -- -- unsigned long last_change_serial; --}; -- --XSettingsSetting *xsettings_setting_copy (XSettingsSetting *setting); --void xsettings_setting_free (XSettingsSetting *setting); --int xsettings_setting_equal (XSettingsSetting *setting_a, -- XSettingsSetting *setting_b); -- --void xsettings_list_free (XSettingsList *list); --XSettingsList *xsettings_list_copy (XSettingsList *list); --XSettingsResult xsettings_list_insert (XSettingsList **list, -- XSettingsSetting *setting); --XSettingsSetting *xsettings_list_lookup (XSettingsList *list, -- const char *name); --XSettingsResult xsettings_list_delete (XSettingsList **list, -- const char *name); -- --char xsettings_byte_order (void); -- --#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1))) -- --#ifdef __cplusplus --} --#endif /* __cplusplus */ -- --#endif /* XSETTINGS_COMMON_H */ diff --git a/matchbox/libmatchbox/libmb.pc.in.patch b/matchbox/libmatchbox/libmb.pc.in.patch deleted file mode 100644 index 10d6bf746..000000000 --- a/matchbox/libmatchbox/libmb.pc.in.patch +++ /dev/null @@ -1,14 +0,0 @@ -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@ diff --git a/matchbox/libxsettings-client/01-ignore-xsettings-common-h.patch b/matchbox/libxsettings-client/01-ignore-xsettings-common-h.patch deleted file mode 100644 index 31229d2e9..000000000 --- a/matchbox/libxsettings-client/01-ignore-xsettings-common-h.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 deleted file mode 100644 index 72fad09b6..000000000 --- a/matchbox/libxsettings-client/APKBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# 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 deleted file mode 100644 index 9ecdd4b1e..000000000 --- a/matchbox/libxsettings/APKBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# 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 deleted file mode 100644 index 6c76eed35..000000000 --- a/matchbox/matchbox-common/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Duncan Guthrie -# Maintainer: Duncan Guthrie -pkgname=matchbox-common -pkgver=0_git20070606 -pkgrel=2 -_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 - matchbox-v2-utils.patch" -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 - make -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="742c38c60efa99de6a7d9bf510045eaf8ea1038722c9e45d614b66a3112f2b48f715d53bf9d44f173ca35e858aee135d0fbc3ed4fe0937b74c40ac515c5320f4 matchbox-common-3055fb158054d059e9a50141e7ded2a41ecfbd47.tar.gz -d2e01db56b2f230ca36773e96678359e528570fc0a3f78124ab1088cdf94a495d67173dec539400f7529382bc405ac9de93e266a905c022099396d1865fe1775 matchbox-v2-utils.patch" diff --git a/matchbox/matchbox-common/matchbox-v2-utils.patch b/matchbox/matchbox-common/matchbox-v2-utils.patch deleted file mode 100644 index 748a149e3..000000000 --- a/matchbox/matchbox-common/matchbox-v2-utils.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur a/matchbox-session b/matchbox-session ---- a/matchbox-session 2018-05-12 13:33:32.019726303 +0100 -+++ b/matchbox-session 2018-05-12 13:34:06.633851723 +0100 -@@ -4,21 +4,25 @@ - # - - # 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 & -+matchbox-keyboard --daemon & -+exec matchbox-window-manager-2-simple -use_cursor yes $@ diff --git a/matchbox/matchbox-desktop/APKBUILD b/matchbox/matchbox-desktop/APKBUILD deleted file mode 100644 index 304b47fbe..000000000 --- a/matchbox/matchbox-desktop/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Duncan Guthrie -# Maintainer: Duncan Guthrie -pkgname=matchbox-desktop -pkgver=2.0 -pkgrel=0 -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="http://http.debian.net/debian/pool/main/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" -options="!check" - -build() { - cd "$builddir" - ./configure \ - --enable-startup-notification \ - --enable-dnotify \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - LIBS="-lX11" - make -} - -package() { - cd "$builddir" - make DESTDIR=$pkgdir install -} - -sha512sums="c1e4b4312a21691b9fe6f956e788d6064835bf062d69944b0124f7c274464b13320d8b8641315fe0c355eb5e35f8f42c9b817232f4aedf443a7bf34cb047f725 matchbox-desktop_2.0.orig.tar.gz" diff --git a/matchbox/matchbox-panel/APKBUILD b/matchbox/matchbox-panel/APKBUILD deleted file mode 100644 index 51a93dc8e..000000000 --- a/matchbox/matchbox-panel/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: Duncan Guthrie -# Maintainer: Duncan Guthrie -pkgname=matchbox-panel -_pkgname=$pkgname-2 -pkgver=2.11_git20161123 -pkgrel=0 -_commit="f82ca3f42510fb3ef10f598b393eb373a2c34ca7" -pkgdesc="Simple GTK+3-based panel for handheld devices" -url="http://matchbox-project.org" -arch="all" -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" - autoreconf --install - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-startup-notification \ - --enable-dbus - make -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="faf5d3cb25a8cc88656099986e3f44b6f8d7fbd16ea510ca2bab04b40bd3e82304604dd4214d1015e6f14a396d442a8adac0436ea4f1745174178665bcb1f299 matchbox-panel-2-f82ca3f42510fb3ef10f598b393eb373a2c34ca7.tar.gz -b4ec412a269565d8eb426d339c68e13ae839700658b4654ae32fbd53ad53bd3948647fe84cb59051e1fe1517f5dbd69f1cbda255278f51107a5c444780680ef7 allow-smaller-icons.patch" diff --git a/matchbox/matchbox-panel/allow-smaller-icons.patch b/matchbox/matchbox-panel/allow-smaller-icons.patch deleted file mode 100644 index d13dd3d5a..000000000 --- a/matchbox/matchbox-panel/allow-smaller-icons.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f83a9179696b2d060ee4860733dafbf38bbd4b87 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -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 -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 - diff --git a/matchbox/matchbox-window-manager/APKBUILD b/matchbox/matchbox-window-manager/APKBUILD deleted file mode 100644 index 4fb6df236..000000000 --- a/matchbox/matchbox-window-manager/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: Duncan Guthrie -# Maintainer: Duncan Guthrie -pkgname=matchbox-window-manager -_pkgname=$pkgname-2 -pkgver=2.0_git20171119 -pkgrel=0 -_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" -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" - autoreconf --install - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/ \ - --with-gtk \ - --with-pango \ - LIBS="-lexpat" - make -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="5972c9304de064501f657e3fc7920b4fd25dec24db609442e340dbe1850dd48b5cc9abaca1ad175cbb52fdede180f12b522ab0e8c028f12a1bd691710f15d5f3 matchbox-window-manager-2-5f44595c66be118b1a74f489de7f8492035cbdf0.tar.gz -76e0af420f81ce6af545e3f42cb3deb73378dc10db21e6f4eb0e4baddb9c617366d3409bccf3c9b5a14e76e54401a90270ec6a720e16175452736a4ce497b818 libpng.pc.patch" diff --git a/matchbox/matchbox-window-manager/libpng.pc.patch b/matchbox/matchbox-window-manager/libpng.pc.patch deleted file mode 100644 index a678b9b71..000000000 --- a/matchbox/matchbox-window-manager/libpng.pc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 \