This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from fb2e9a8 debian/rules: execute new debian/compat.sh file before the actual build. new fe011b5 Support building with legacy (pre-1.4.2) libXfont(1) versions. new c7c4987 nx-libs.spec: older *SUSE versions do not split up (all) libraries in a useful manner. new 3411a8b nx-libs.spec: imake is part of xorg-x11-util-devel on older *SUSE versions and the splitted imake package on later versions. new 3206eac nx-libs.spec: pixman is called libpixman-1-0 on older *SUSE versions. 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 | 2 +- nx-X11/config/cf/Imake.tmpl | 7 +++++++ nx-X11/config/cf/host.def | 7 +++++++ nx-X11/config/cf/xorg.cf | 4 ++++ nx-X11/programs/Xserver/dix/dixfonts.c | 6 ++++++ nx-X11/programs/Xserver/include/dixfont.h | 4 ++++ nx-libs.spec | 15 +++++++-------- 7 files changed, 36 insertions(+), 9 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 fe011b55df68b7419a8042db94fc3fd1bcaca497 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 16 03:55:58 2017 +0100 Support building with legacy (pre-1.4.2) libXfont(1) versions. Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a forward-compatible manner. Legacy libXfont1 versions are automatically detected by the main Makefile. --- Makefile | 2 +- nx-X11/config/cf/Imake.tmpl | 7 +++++++ nx-X11/config/cf/host.def | 7 +++++++ nx-X11/config/cf/xorg.cf | 4 ++++ nx-X11/programs/Xserver/dix/dixfonts.c | 6 ++++++ nx-X11/programs/Xserver/include/dixfont.h | 4 ++++ nx-libs.spec | 2 +- 7 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cfd0d10..b0beacd 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ INCLUDEDIR ?= $(PREFIX)/include CONFIGURE ?= ./configure --prefix=$(PREFIX) # use Xfont2 if available in the build env -FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2") +FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2") $(shell pkg-config --exists 'xfont < 1.4.2' 1>/dev/null 2>/dev/null && echo "-DLEGACY_XFONT1") XFONTLIB ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-lXfont2" || echo "-lXfont") NX_VERSION_MAJOR=$(shell ./version.sh 1) diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 85228ae..44fe2f3 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -555,6 +555,9 @@ X_BYTE_ORDER = ByteOrder #ifndef HasXfont2 #define HasXfont2 NO #endif +#ifndef HasLegacyXfont1 +#define HasLegacyXfont1 NO +#endif #ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */ #define GzipLibrary -lz #endif @@ -1871,7 +1874,11 @@ SETITIMER_DEFINES = HasSetitimerDefines FONT_DEFINES = -DHAS_XFONT2 XFONTLIB = -lXfont2 #else +#if HasLegacyXfont1 +FONT_DEFINES = -DLEGACY_XFONT1 +#else FONT_DEFINES = +#endif XFONTLIB = -lXfont #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 4a11359..abacf2c 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -396,6 +396,13 @@ */ /* + * If building against libXfont(1) and using a legacy version (lower than 1.4.2), + * uncomment this. + * +#define HasLegacyXfont1 YES + */ + +/* * If you are running NetBSD 0.9C or later, and have the aperture driver * installed, uncomment this. * diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 13ccd57..50a1f45 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -428,6 +428,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define HasXfont2 NO #endif +#ifndef HasLegacyXfont1 +# define HasLegacyXfont1 NO +#endif + #ifndef BuildScreenSaverExt # define BuildScreenSaverExt YES #endif diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index 98d2a64..0d90cd7 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -2139,7 +2139,13 @@ InitFonts () ResetFontPrivateIndex(); +#ifdef LEGACY_XFONT1 + BuiltinRegisterFpeFunctions(); + FontFileRegisterFpeFunctions(); + fs_register_fpe_functions(); +#else register_fpe_functions(); +#endif } #endif /* HAS_XFONT2 */ diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h index 21d917f..9ae5515 100644 --- a/nx-X11/programs/Xserver/include/dixfont.h +++ b/nx-X11/programs/Xserver/include/dixfont.h @@ -152,7 +152,11 @@ extern void dixGetGlyphs(FontPtr /*font*/, unsigned long * /*glyphcount*/, CharInfoPtr * /*glyphs*/); +#ifdef LEGACY_XFONT1 +extern void BuiltinRegisterFpeFunctions(void); +#else extern void register_fpe_functions(void); +#endif extern void QueryGlyphExtents(FontPtr /*pFont*/, CharInfoPtr * /*charinfo*/, diff --git a/nx-libs.spec b/nx-libs.spec index 7b34538..9a13ac0 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -82,7 +82,7 @@ BuildRequires: pixman-devel >= 0.13.2 BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel -BuildRequires: xorg-x11-libXfont-devel >= 1.4.2 +BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXdamage-devel BuildRequires: xorg-x11-libXcomposite-devel -- 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 3411a8bc787c12539429ba141392703d23c471b1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 16 04:16:45 2017 +0100 nx-libs.spec: imake is part of xorg-x11-util-devel on older *SUSE versions and the splitted imake package on later versions. --- nx-libs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nx-libs.spec b/nx-libs.spec index 544c0ab..4081e76 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -29,7 +29,11 @@ BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: pkgconfig +%if 0%{?suse_version} && 0%{?suse_version} < 1210 +BuildRequires: xorg-x11-util-devel +%else BuildRequires: imake +%endif # ideally we build with quilt (for mesa-quilt patch appliance script), # it seems Fedora has it... @@ -87,7 +91,6 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXfixes-devel %endif -BuildRequires: xorg-x11-util-devel %endif %if 0%{?fedora} || 0%{?rhel} -- 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 c7c4987b807869fc559af20f90b1e65a5f4caa08 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 16 04:16:06 2017 +0100 nx-libs.spec: older *SUSE versions do not split up (all) libraries in a useful manner. --- nx-libs.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 9a13ac0..544c0ab 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -83,13 +83,9 @@ BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-libXdmcp-devel -BuildRequires: xorg-x11-libXdamage-devel -BuildRequires: xorg-x11-libXcomposite-devel -BuildRequires: xorg-x11-libXrandr-devel BuildRequires: xorg-x11-libXfixes-devel -BuildRequires: xorg-x11-libXtst-devel -BuildRequires: xorg-x11-libXinerama-devel %endif BuildRequires: xorg-x11-util-devel %endif -- 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 3206eacf67ec421f52b2a407e36e69d1bf783abd Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 16 04:17:24 2017 +0100 nx-libs.spec: pixman is called libpixman-1-0 on older *SUSE versions. --- nx-libs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-libs.spec b/nx-libs.spec index 4081e76..f3f49ee 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -82,7 +82,7 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: libexpat-devel BuildRequires: libpng-devel BuildRequires: libxml2-devel -BuildRequires: pixman-devel >= 0.13.2 +BuildRequires: libpixman-1-0-devel BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org