From: Bernd Kuhls Date: Sat, 4 Mar 2017 19:54:55 +0000 (+0100) Subject: package/x11r7/xapp_sessreg: bump version to 1.1.1 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6bc02f8c2a99bc80da3dd3f7ac014d8be9c044b;p=buildroot.git package/x11r7/xapp_sessreg: bump version to 1.1.1 Removed patch applied upstream: https://cgit.freedesktop.org/xorg/app/sessreg/commit/?id=93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d Renumbered remaining patch. Changed _SITE according to URL mentioned in upstream release note. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- diff --git a/package/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch b/package/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch deleted file mode 100644 index 5c3e91a491..0000000000 --- a/package/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Wed, 9 Sep 2015 23:44:06 +0200 -Subject: [PATCH] Pass -P to the preprocessor when generating filenames for the - manpage. - -Fixes build with GCC 5. Patch by Richard Biener - -Tested-by: Matt Turner -Signed-off-by: Matt Turner -[Thomas: backport from upstream commit 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d] -Signed-off-by: Thomas Petazzoni ---- - man/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 665ace5..2e5f146 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man - - AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - filenames.sed: filenames.sed.c -- $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \ - $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@ - --- -2.6.3 - diff --git a/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch b/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch new file mode 100644 index 0000000000..0be242c0b2 --- /dev/null +++ b/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch @@ -0,0 +1,24 @@ +Fix missing defines _PATH_WTMPX/_PATH_UTMPX in musl + +Downloaded from +https://cgit.gentoo.org/proj/musl.git/tree/x11-apps/sessreg/files/sessreg-1.1.0-missing_path_wtmpx.patch + +Signed-off-by: Bernd Kuhls + +diff -Naur sessreg-1.1.0.orig/sessreg.h sessreg-1.1.0/sessreg.h +--- sessreg-1.1.0.orig/sessreg.h 2015-01-20 05:00:27.000000000 +0000 ++++ sessreg-1.1.0/sessreg.h 2016-02-23 11:54:42.057000000 +0000 +@@ -103,6 +103,13 @@ + # define TTYS_FILE "/etc/ttys" + #endif + ++#ifndef _PATH_WTMPX ++# define _PATH_WTMPX "/var/log/wtmp" ++#endif ++#ifndef _PATH_UTMPX ++# define _PATH_UTMPX "/var/log/utmp" ++#endif ++ + #ifndef WTMPX_FILE + # define WTMPX_FILE _PATH_WTMPX + #endif diff --git a/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch b/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch deleted file mode 100644 index 0be242c0b2..0000000000 --- a/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix missing defines _PATH_WTMPX/_PATH_UTMPX in musl - -Downloaded from -https://cgit.gentoo.org/proj/musl.git/tree/x11-apps/sessreg/files/sessreg-1.1.0-missing_path_wtmpx.patch - -Signed-off-by: Bernd Kuhls - -diff -Naur sessreg-1.1.0.orig/sessreg.h sessreg-1.1.0/sessreg.h ---- sessreg-1.1.0.orig/sessreg.h 2015-01-20 05:00:27.000000000 +0000 -+++ sessreg-1.1.0/sessreg.h 2016-02-23 11:54:42.057000000 +0000 -@@ -103,6 +103,13 @@ - # define TTYS_FILE "/etc/ttys" - #endif - -+#ifndef _PATH_WTMPX -+# define _PATH_WTMPX "/var/log/wtmp" -+#endif -+#ifndef _PATH_UTMPX -+# define _PATH_UTMPX "/var/log/utmp" -+#endif -+ - #ifndef WTMPX_FILE - # define WTMPX_FILE _PATH_WTMPX - #endif diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/package/x11r7/xapp_sessreg/xapp_sessreg.hash index 9c1a8029b2..47495b23df 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.hash +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002522.html -sha256 551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c sessreg-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-February/002778.html +sha256 78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1 sessreg-1.1.1.tar.bz2 diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk index 08811c015e..c6e9463d3b 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SESSREG_VERSION = 1.1.0 +XAPP_SESSREG_VERSION = 1.1.1 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2 -XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SESSREG_LICENSE = MIT XAPP_SESSREG_LICENSE_FILES = COPYING XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto