SF.net SVN: gar:[26652] csw/mgar/pkg/gnustep-back/trunk
rmottola at users.sourceforge.net
rmottola at users.sourceforge.net
Mon May 18 23:54:43 CEST 2020
Revision: 26652
http://sourceforge.net/p/gar/code/26652
Author: rmottola
Date: 2020-05-18 21:54:43 +0000 (Mon, 18 May 2020)
Log Message:
-----------
gnustep-back/trunk: update to 0.28
Modified Paths:
--------------
csw/mgar/pkg/gnustep-back/trunk/Makefile
csw/mgar/pkg/gnustep-back/trunk/checksums
csw/mgar/pkg/gnustep-back/trunk/files/0001-FC_FULLNAME-missing-if-no-fontconfig.patch
Added Paths:
-----------
csw/mgar/pkg/gnustep-back/trunk/files/0002-FC_FULLNAME-missing-if-no-fontconfig.patch
Modified: csw/mgar/pkg/gnustep-back/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnustep-back/trunk/Makefile 2020-05-18 20:13:26 UTC (rev 26651)
+++ csw/mgar/pkg/gnustep-back/trunk/Makefile 2020-05-18 21:54:43 UTC (rev 26652)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = gnustep-back
-VERSION = 0.27.0
+VERSION = 0.28.0
GARTYPE = v2
DESCRIPTION = GNUstep-core back
@@ -14,6 +14,7 @@
DISTFILES = $(DISTNAME).tar.gz
PATCHFILES += 0001-FC_FULLNAME-missing-if-no-fontconfig.patch
+PATCHFILES += 0002-FC_FULLNAME-missing-if-no-fontconfig.patch
BUILD_DEP_PKGS += CSWgmake
BUILD_DEP_PKGS += CSWsunx11devel
@@ -36,10 +37,10 @@
RUNTIME_DEP_PKGS_CSWgnustep-back += CSWmesa
RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibfreetype6
#solaris 10
+RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibobjc4
RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibxft2
@@ -56,7 +57,7 @@
#this is by bundle design
-CHECKPKG_OVERRIDES_CSWgnustep-back += shared-library-missing-dot-so|file=opt/csw/GNUstep/System/Library/Bundles/libgnustep-back-027.bundle/libgnustep-back-027
+CHECKPKG_OVERRIDES_CSWgnustep-back += shared-library-missing-dot-so|file=opt/csw/GNUstep/System/Library/Bundles/libgnustep-back-028.bundle/libgnustep-back-028
#we do not care about placement
CHECKPKG_OVERRIDES_CSWgnustep-back += binary-architecture-does-not-match-placement
@@ -89,9 +90,16 @@
#CONFIGURE_ARGS_5.9 += --enable-graphics=xlib
CONFIGURE_ARGS_5.9 += --enable-graphics=cairo
+CONFIGURE_ARGS_5.9 += CAIRO_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API -I/opt/csw/include/cairo -I/opt/csw/include/pixman-1 -I/opt/csw/include -I/opt/csw/include/freetype2 -I/opt/csw/include/libpng16"
+CONFIGURE_ARGS_5.9 += CAIRO_LIBS="-L/opt/csw/lib -lcairo -lpthread"
+CONFIGURE_ARGS_5.9 += CAIRO_XLIB_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API -I/opt/csw/include/cairo -I/opt/csw/include -I/opt/csw/include/pixman-1 -I/opt/csw/include/freetype2 -I/opt/csw/include/libpng16 "
+CONFIGURE_ARGS_5.9 += CAIRO_XLIB_LIBS="-L/opt/csw/lib -lcairo -lXext -lX11 "
#CONFIGURE_ARGS_5.9 += --without-freetype
#CONFIGURE_ARGS_5.9 += CFLAGS="$(CFLAGS) -I/opt/csw/include/freetype2"
-#CONFIGURE_ARGS_5.9 += CFLAGS="$(CFLAGS) -I/opt/csw/include/freetype2 -I/opt/csw/include/cairo" LDFLAGS="$(LDFLAGS) -lcairo"
+#CONFIGURE_ARGS_5.9 += CFLAGS="$(CFLAGS) " LDFLAGS="$(LDFLAGS) -lcairo -lpthread"
+
+
+
CONFIGURE_ARGS_5.10 += --enable-graphics=cairo
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
@@ -98,12 +106,6 @@
BUILD_ARGS += messages=yes
-EXTRA_CPPFLAGS += -I$(includedir)/freetype2
-EXTRA_CPPFLAGS += -I$(includedir)/cairo
-
-EXTRA_LDFLAGS += -lcairo
-EXTRA_LDFLAGS += -lpthread
-
include gar/category.mk
configure-sourcegs:
Modified: csw/mgar/pkg/gnustep-back/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnustep-back/trunk/checksums 2020-05-18 20:13:26 UTC (rev 26651)
+++ csw/mgar/pkg/gnustep-back/trunk/checksums 2020-05-18 21:54:43 UTC (rev 26652)
@@ -1 +1 @@
-086bebdb1f1a78c9255da868f96f3564 gnustep-back-0.27.0.tar.gz
+4ee7f262a07b046c54d75391fbbc5eac gnustep-back-0.28.0.tar.gz
Modified: csw/mgar/pkg/gnustep-back/trunk/files/0001-FC_FULLNAME-missing-if-no-fontconfig.patch
===================================================================
--- csw/mgar/pkg/gnustep-back/trunk/files/0001-FC_FULLNAME-missing-if-no-fontconfig.patch 2020-05-18 20:13:26 UTC (rev 26651)
+++ csw/mgar/pkg/gnustep-back/trunk/files/0001-FC_FULLNAME-missing-if-no-fontconfig.patch 2020-05-18 21:54:43 UTC (rev 26652)
@@ -1,27 +1,14 @@
-From d1e9ef277e40f2617baa1e2d2bc9507e4d06bf64 Mon Sep 17 00:00:00 2001
-From: Riccardo Mottola <rmottola at opencsw.org>
-Date: Thu, 27 Apr 2017 14:41:12 +0200
-Subject: [PATCH] FC_FULLNAME missing if no fontconfig
-
----
- Source/fontconfig/FCFontEnumerator.m | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Source/fontconfig/FCFontEnumerator.m b/Source/fontconfig/FCFontEnumerator.m
-index fcdd706..a34bd4d 100644
---- a/Source/fontconfig/FCFontEnumerator.m
-+++ b/Source/fontconfig/FCFontEnumerator.m
-@@ -53,6 +53,10 @@
+--- a/Source/fontconfig/FCFontEnumerator.m Sun Apr 5 22:21:59 2020
++++ b/Source/fontconfig/FCFontEnumerator.m Mon May 18 23:33:37 2020
+@@ -53,6 +53,11 @@
#define FC_WEIGHT_ULTRABLACK FC_WEIGHT_BLACK
#endif
+#ifndef FC_FULLNAME
+#define FC_FULLNAME "fullname" /* String */
++#define FC_WEIGHT_BOOK 75
+#endif
+
- @implementation FCFontEnumerator
-
- NSMutableDictionary * __allFonts;
---
-1.7.10.3
-
+ static float
+ convertWeight (int fcWeight, int bottomValue, int topValue)
+ {
Added: csw/mgar/pkg/gnustep-back/trunk/files/0002-FC_FULLNAME-missing-if-no-fontconfig.patch
===================================================================
--- csw/mgar/pkg/gnustep-back/trunk/files/0002-FC_FULLNAME-missing-if-no-fontconfig.patch (rev 0)
+++ csw/mgar/pkg/gnustep-back/trunk/files/0002-FC_FULLNAME-missing-if-no-fontconfig.patch 2020-05-18 21:54:43 UTC (rev 26652)
@@ -0,0 +1,13 @@
+--- a/Source/fontconfig/FCFaceInfo.m.orig Mon May 18 23:27:19 2020
++++ b/Source/fontconfig/FCFaceInfo.m Mon May 18 23:28:28 2020
+@@ -32,6 +32,10 @@
+ #include "fontconfig/FCFontEnumerator.h"
+ #include <AppKit/NSFontManager.h>
+
++#ifndef FC_FULLNAME
++#define FC_FULLNAME "fullname" /* String */
++#endif
++
+ @implementation FCFaceInfo
+
+ - (id) initWithfamilyName: (NSString *)familyName
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list