This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from d2dae84 Merge branch 'uli42-pr/Xext-1.4.2' into 3.6.x new 7b08c7d debian/control: Add to B-D: libxkbfile-dev. Required by xkbcomp.pc (pkg-config). new a12ab41 debian/contrl: Bump Standards-Version: to 4.2.1. No changes needed. new 89f1e3b Makefile: support systems without xkbcomp.pc. new 93c9b88 nx-libs.spec: newer versions of SLE* and OpenSuSE use xkbcomp-devel, while RedHat-based distros want xorg-x11-xkb-utils-devel for xkbcomp.pc. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 8 +++++++- debian/control | 4 +++- nx-libs.spec | 11 +++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 7b08c7dfcfa744f34ff8b15f433b4bd875601891 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 9 23:10:51 2018 +0100 debian/control: Add to B-D: libxkbfile-dev. Required by xkbcomp.pc (pkg-config). --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 6d36078..79ee507 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,8 @@ Build-Depends: libxext-dev, libxfixes-dev, libxfont-dev (>= 1.4.2), +# libxkbfile-dev is required by xkbcomp.pc, see Debian bug #913359 + libxkbfile-dev, libxinerama-dev, libxml2-dev, libxpm-dev, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit a12ab412db661c9139bf95570a4f4250b31759a0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 9 23:14:16 2018 +0100 debian/contrl: Bump Standards-Version: to 4.2.1. No changes needed. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 79ee507..2f026f6 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends: xutils-dev, zlib1g-dev, lsb-release -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 93c9b8862e68a5be51852dbaaf8d2e005c0b2b54 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 07:30:23 2018 +0100 nx-libs.spec: newer versions of SLE* and OpenSuSE use xkbcomp-devel, while RedHat-based distros want xorg-x11-xkb-utils-devel for xkbcomp.pc. --- nx-libs.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 396ff23..3066219 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -32,10 +32,17 @@ BuildRequires: pkgconfig %if 0%{?suse_version} && 0%{?suse_version} < 1210 BuildRequires: xorg-x11-util-devel %else -# we need xkbcomp.pc -BuildRequires: xorg-x11-xkb-utils-devel BuildRequires: imake %endif +# For xkbcomp.pc. +%if 0%{?suse_version} +# Earlier versions don't have xkbcomp.pc at all. +%if 0%{?suse_version} >= 1210 +BuildRequires: xkbcomp-devel +%endif +%else +BuildRequires: xorg-x11-xkb-utils-devel +%endif # ideally we build with quilt (for mesa-quilt patch appliance script), # it seems Fedora has it... -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 89f1e3baa7cf7bd40ceb28d735026c3ece321293 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 07:27:14 2018 +0100 Makefile: support systems without xkbcomp.pc. (Very) old SLE versions don't have that file at all and we can do without - we'll just use the previous, default values. This also means that we don't need to preinstall a package containing xkbcomp.pc on Debian and derivates for the cleaning target. --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc094f7..9213dda 100644 --- a/Makefile +++ b/Makefile @@ -34,13 +34,19 @@ IMAKE_FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/ XEXT_EXTRA_DEFINES ?= $(shell pkg-config --exists 'xextproto < 7.1.0' 1>/dev/null 2>/dev/null && echo "-DLEGACY_XEXT_PROTO") # check if the xkbcomp devel pkg is available - we need it for the next step +HAS_XKBCOMP_DEVEL="yes" ifneq ($(shell pkg-config --exists xkbcomp && echo yes), yes) - $(error required xkbcomp devel package missing) + $(warning xkbcomp devel package missing, using default values) + HAS_XKBCOMP_DEVEL="no" endif # the system's directory with the xkb data files (this needs to be # independent of Imake's ProjectRoot or the configure prefix.) +ifeq ($(HAS_XKBCOMP_DEVEL),yes) XKB_SYS_DEFINES ?= -DSystemXkbConfigDir=$(shell pkg-config xkbcomp --variable=xkbconfigdir) -DSystemXkbBinDir=$(shell pkg-config xkbcomp --variable=prefix)/bin +else +XKB_SYS_DEFINES ?= -DSystemXkbConfigDir=/usr/share/X11/xkb -DSystemXkbBinDir=/usr/bin +endif IMAKE_DEFINES ?= -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org