Update to gnustep-gui 0.22.0

bump SHLIB_VERSION
introduce LIBDIR variable
get rid of pre-configure mess
use default font sizes

needed and also the following gnustep related stuff, due to the gnustep-base update
This commit is contained in:
sebastia 2012-07-08 13:35:08 +00:00
parent 564cc5ed39
commit ad3e679ff8
5 changed files with 82 additions and 118 deletions

View File

@ -1,19 +1,20 @@
# $OpenBSD: Makefile,v 1.24 2011/04/18 11:56:01 sebastia Exp $
# $OpenBSD: Makefile,v 1.25 2012/07/08 13:35:08 sebastia Exp $
COMMENT= GNUstep gui library
DISTNAME = gnustep-gui-0.20.0
DISTNAME = gnustep-gui-0.22.0
CATEGORIES= devel
# needs to follow gnustep-back backend versioning
# cf. gnustep_backend_bundle() in ${WRKSRC}/Source/NSApplication.m
SHARED_LIBS = gnustep-gui 0.20 # .0.20.0
SHARED_LIBS = gnustep-gui 0.22 # .0.22.0
HOMEPAGE= http://www.gnustep.org/
WANTLIB += objc gnustep-base asn1 crypto gssapi krb5 ssl stdc++
WANTLIB += tiff z ao jpeg ungif png cups aspell c m pthread sndfile
WANTLIB += icudata icui18n icuuc
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
@ -34,10 +35,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng" \
CONFIGURE_ARGS= --with-x
USE_GROFF = Yes
pre-configure:
@perl -pi -e 's,^GNUSTEP_GUI_MAJOR_VERSION=.*,GNUSTEP_GUI_MAJOR_VERSION=${LIBgnustep-gui_VERSION:R},g;' \
-e 's,^GNUSTEP_GUI_MINOR_VERSION=.*,GNUSTEP_GUI_MINOR_VERSION=${LIBgnustep-gui_VERSION:E},g' \
${WRKSRC}/Version
LIBDIR = lib/GNUstep/Libraries/gnustep-gui/Versions/${LIBgnustep-gui_VERSION}
SUBST_VARS += LIBDIR
MAKE_FLAGS += libgnustep-gui_INTERFACE_VERSION=${LIBgnustep-gui_VERSION}
post-install:
${INSTALL_MAN} ${WRKSRC}/Documentation/make_services.1 \

View File

@ -1,5 +1,5 @@
MD5 (gnustep/gnustep-gui-0.20.0.tar.gz) = DTdlqpfbHdIL29BpD0rKaw==
RMD160 (gnustep/gnustep-gui-0.20.0.tar.gz) = Ol73+mHQoZLgNoZqGXSbem363II=
SHA1 (gnustep/gnustep-gui-0.20.0.tar.gz) = 6G837TX7quXLAPxjXLt2Puu9vX4=
SHA256 (gnustep/gnustep-gui-0.20.0.tar.gz) = JvKJUfB8CrtUOfRotgpnJhaMUQrjV5zQdeapxbq3P1o=
SIZE (gnustep/gnustep-gui-0.20.0.tar.gz) = 2648224
MD5 (gnustep/gnustep-gui-0.22.0.tar.gz) = OqM0YHFzYgbKFEzhzo8GPw==
RMD160 (gnustep/gnustep-gui-0.22.0.tar.gz) = IBU0gNcSoUjp5QTwknP3Dhui9tI=
SHA1 (gnustep/gnustep-gui-0.22.0.tar.gz) = 3JZU6jQ3gQqbS/09IZOiViioi0E=
SHA256 (gnustep/gnustep-gui-0.22.0.tar.gz) = IBoC2kWjrSKF/uam/MfIpGNjLifTF11yk+IpDlc/yl0=
SIZE (gnustep/gnustep-gui-0.22.0.tar.gz) = 2734733

View File

@ -1,37 +0,0 @@
$OpenBSD: patch-Source_NSFont_m,v 1.4 2010/05/12 16:44:17 jasper Exp $
--- Source/NSFont.m.orig Sat Feb 20 17:30:27 2010
+++ Source/NSFont.m Wed May 12 10:12:27 2010
@@ -168,13 +168,13 @@ keyForFont(NSString *name, const CGFloat *matrix, BOOL
<list>
<item>NSBoldFontSize (none)</item>
<item>NSControlContentFontSize (none)</item>
- <item>NSFontSize 12 (System Font Size)</item>
+ <item>NSFontSize 9 (System Font Size)</item>
<item>NSLabelFontSize (none)</item>
<item>NSMenuFontSize (none)</item>
<item>NSMiniFontSize 6</item>
<item>NSMessageFontSize (none)</item>
<item>NSPaletteFontSize (none)</item>
- <item>NSSmallFontSize 9</item>
+ <item>NSSmallFontSize 8</item>
<item>NSTitleBarFontSize (none)</item>
<item>NSToolTipsFontSize (none)</item>
<item>NSUserFixedPitchFontSize (none)</item>
@@ -661,7 +661,7 @@ static void setNSFont(NSString *key, NSFont *font)
if (fontSize == 0)
{
- fontSize = 9;
+ fontSize = 8;
}
return fontSize;
@@ -673,7 +673,7 @@ static void setNSFont(NSString *key, NSFont *font)
if (fontSize == 0)
{
- fontSize = 12;
+ fontSize = 9;
}
return fontSize;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2010/05/12 16:44:17 jasper Exp $
--- configure.orig Wed May 12 10:12:02 2010
+++ configure Wed May 12 10:12:19 2010
@@ -5596,7 +5596,7 @@ if test "${ac_cv_lib_cups_cupsServer+set}" = set; then
$OpenBSD: patch-configure,v 1.4 2012/07/08 13:35:08 sebastia Exp $
--- configure.orig Mon Jan 30 22:06:08 2012
+++ configure Mon Apr 9 16:01:29 2012
@@ -6104,7 +6104,7 @@ if ${ac_cv_lib_cups_cupsServer+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2011/04/18 11:56:01 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.9 2012/07/08 13:35:08 sebastia Exp $
@bin bin/gclose
@bin bin/gcloseall
@bin bin/gopen
@ -471,70 +471,70 @@ lib/GNUstep/KeyBindings/
lib/GNUstep/KeyBindings/DefaultKeyBindings.dict
lib/GNUstep/Libraries/gnustep-gui/
lib/GNUstep/Libraries/gnustep-gui/Versions/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSDataLinkPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSFindPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSFindPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSFindPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPageLayout.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPageLayout.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPageLayout.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPrintPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPrintPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPrintPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSSpellPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSSpellPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/English.lproj/Localizable.strings
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Esperanto.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Esperanto.lproj/Localizable.strings
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/French.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/French.lproj/Localizable.strings
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/German.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/German.lproj/Localizable.strings
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Info-gnustep.plist
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Italian.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Italian.lproj/Localizable.strings
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Lojban.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Lojban.lproj/Localizable.strings
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSDataLinkPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSFindPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPageLayout.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPrintPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSSpellPanel.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
lib/GNUstep/Libraries/gnustep-gui/Versions/0.20/Resources/Spanish.lproj/Localizable.strings
${LIBDIR}/
${LIBDIR}/Resources/
${LIBDIR}/Resources/English.lproj/
${LIBDIR}/Resources/English.lproj/GSDataLinkPanel.gorm/
${LIBDIR}/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
${LIBDIR}/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
${LIBDIR}/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
${LIBDIR}/Resources/English.lproj/GSFindPanel.gorm/
${LIBDIR}/Resources/English.lproj/GSFindPanel.gorm/data.classes
${LIBDIR}/Resources/English.lproj/GSFindPanel.gorm/data.info
${LIBDIR}/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
${LIBDIR}/Resources/English.lproj/GSPageLayout.gorm/
${LIBDIR}/Resources/English.lproj/GSPageLayout.gorm/data.classes
${LIBDIR}/Resources/English.lproj/GSPageLayout.gorm/data.info
${LIBDIR}/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
${LIBDIR}/Resources/English.lproj/GSPrintPanel.gorm/
${LIBDIR}/Resources/English.lproj/GSPrintPanel.gorm/data.classes
${LIBDIR}/Resources/English.lproj/GSPrintPanel.gorm/data.info
${LIBDIR}/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
${LIBDIR}/Resources/English.lproj/GSSpellPanel.gorm/
${LIBDIR}/Resources/English.lproj/GSSpellPanel.gorm/data.classes
${LIBDIR}/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
${LIBDIR}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/
${LIBDIR}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
${LIBDIR}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
${LIBDIR}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
${LIBDIR}/Resources/English.lproj/Localizable.strings
${LIBDIR}/Resources/Esperanto.lproj/
${LIBDIR}/Resources/Esperanto.lproj/Localizable.strings
${LIBDIR}/Resources/French.lproj/
${LIBDIR}/Resources/French.lproj/Localizable.strings
${LIBDIR}/Resources/German.lproj/
${LIBDIR}/Resources/German.lproj/Localizable.strings
${LIBDIR}/Resources/Info-gnustep.plist
${LIBDIR}/Resources/Italian.lproj/
${LIBDIR}/Resources/Italian.lproj/Localizable.strings
${LIBDIR}/Resources/Lojban.lproj/
${LIBDIR}/Resources/Lojban.lproj/Localizable.strings
${LIBDIR}/Resources/Spanish.lproj/
${LIBDIR}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/
${LIBDIR}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
${LIBDIR}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
${LIBDIR}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
${LIBDIR}/Resources/Spanish.lproj/GSFindPanel.gorm/
${LIBDIR}/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
${LIBDIR}/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
${LIBDIR}/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
${LIBDIR}/Resources/Spanish.lproj/GSPageLayout.gorm/
${LIBDIR}/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
${LIBDIR}/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
${LIBDIR}/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
${LIBDIR}/Resources/Spanish.lproj/GSPrintPanel.gorm/
${LIBDIR}/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
${LIBDIR}/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
${LIBDIR}/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
${LIBDIR}/Resources/Spanish.lproj/GSSpellPanel.gorm/
${LIBDIR}/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
${LIBDIR}/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
${LIBDIR}/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
${LIBDIR}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/
${LIBDIR}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
${LIBDIR}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
${LIBDIR}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
${LIBDIR}/Resources/Spanish.lproj/Localizable.strings
lib/GNUstep/PostScript/
lib/GNUstep/PostScript/GSProlog.ps
lib/GNUstep/PostScript/PPD/