From 81af8d4a3e01724b3159cf0ea4953eaba9285e56 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 25 Aug 2018 07:14:44 -0300 Subject: [PATCH] xob: update to 0.1.1. --- .../xob/patches/0001-fix-linking-order.patch | 21 ---------- ...-Set-a-WM_CLASS-for-the-bar-X-window.patch | 40 ------------------- srcpkgs/xob/template | 8 ++-- 3 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/xob/patches/0001-fix-linking-order.patch delete mode 100644 srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch diff --git a/srcpkgs/xob/patches/0001-fix-linking-order.patch b/srcpkgs/xob/patches/0001-fix-linking-order.patch deleted file mode 100644 index 8fef69b4d70..00000000000 --- a/srcpkgs/xob/patches/0001-fix-linking-order.patch +++ /dev/null @@ -1,21 +0,0 @@ -From f9fc63952749b7bb9d03778dbe68666160a97e4b Mon Sep 17 00:00:00 2001 -From: Guillaume Babin <645219+gbabin@users.noreply.github.com> -Date: Wed, 22 Aug 2018 21:00:49 +0200 -Subject: [PATCH] Fix #4: Change position of LDFLAGS in Makefile - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- Makefile -+++ Makefile -@@ -16,7 +16,7 @@ MANPREFIX ?= $(PREFIX)/share/man - all: $(PROGRAM) - - $(PROGRAM): $(OBJECTS) -- $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -+ $(CC) -o $@ $(OBJECTS) $(LDFLAGS) - - %.o: %.c %.h - $(CC) $(CFLAGS) -c -o $@ $< - diff --git a/srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch b/srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch deleted file mode 100644 index 7d517eddd8c..00000000000 --- a/srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1cadc7055718138f6ea31765970ca72b7414532e Mon Sep 17 00:00:00 2001 -From: Florent C -Date: Wed, 22 Aug 2018 17:02:05 +0200 -Subject: [PATCH] Fix #3: Set a WM_CLASS for the bar X window - ---- - src/display.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/display.c b/src/display.c -index db451e0..a229647 100644 ---- src/display.c -+++ src/display.c -@@ -17,6 +17,8 @@ - - #include "display.h" - -+#include -+ - /* Keep value in range */ - static int fit_in(int value, int min, int max) - { -@@ -133,6 +135,16 @@ display_context_t init(style_t conf) - DefaultVisual(dc.x.display, dc.x.screen_number), CWOverrideRedirect, - &window_attributes); - -+ /* Set a WM_CLASS for the window */ -+ XClassHint *class_hint = XAllocClassHint(); -+ if (class_hint != NULL) -+ { -+ class_hint->res_name = DEFAULT_CONFIG_APPNAME; -+ class_hint->res_class = DEFAULT_CONFIG_APPNAME; -+ XSetClassHint(dc.x.display, dc.x.window, class_hint); -+ XFree(class_hint); -+ } -+ - /* The new window is not mapped yet */ - dc.x.mapped = False; - - diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template index 824683611bf..4618280ffa5 100644 --- a/srcpkgs/xob/template +++ b/srcpkgs/xob/template @@ -1,8 +1,10 @@ # Template file for 'xob' pkgname=xob -version=0.1 +version=0.1.1 revision=1 build_style=gnu-makefile +make_install_args="prefix=/usr sysconfdir=/etc" +make_use_env=yes hostmakedepends="pkg-config" makedepends="libX11-devel libconfig-devel" short_desc="Lightweight overlay bar for the X Window System" @@ -10,6 +12,4 @@ maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://github.com/florentc/xob" distfiles="https://github.com/florentc/xob/archive/v${version}.tar.gz" -checksum=751d148fdf2bfa4779f05afa22673653b3475ab0418d4803162d2e4a3097f896 - -LDFLAGS="-lX11 -lconfig" +checksum=78e06280504ff21213bc947c97fb0604c42addc0d8dc4a18c239bfd8f0aa1614