1
0
forked from pool/SDL_Pango

- Remove --with-pic (ineffective with --disable-static)

OBS-URL: https://build.opensuse.org/package/show/games/SDL_Pango?expand=0&rev=23
This commit is contained in:
Jan Engelhardt 2019-05-11 12:34:16 +00:00 committed by Git OBS Bridge
parent 5e9d038cd4
commit d41ff30dde
3 changed files with 29 additions and 17 deletions

View File

@ -1,6 +1,13 @@
--- src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100 ---
+++ src/SDL_Pango.c 2006-09-24 22:46:24.000000000 +0200 src/SDL_Pango.c | 41 ++++++++++++++++++++++++++++-------------
@@ -723,13 +723,8 @@ src/SDL_Pango.h | 16 +++++++++++++++-
2 files changed, 43 insertions(+), 14 deletions(-)
Index: SDL_Pango-0.1.2/src/SDL_Pango.c
===================================================================
--- SDL_Pango-0.1.2.orig/src/SDL_Pango.c
+++ SDL_Pango-0.1.2/src/SDL_Pango.c
@@ -723,13 +723,8 @@ SDLPango_CopyFTBitmapToSurface(
SDL_UnlockSurface(surface); SDL_UnlockSurface(surface);
} }
@ -15,7 +22,7 @@
{ {
SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
G_CONST_RETURN char *charset; G_CONST_RETURN char *charset;
@@ -743,8 +738,7 @@ @@ -743,8 +738,7 @@ SDLPango_CreateContext()
pango_context_set_language (context->context, pango_language_from_string (charset)); pango_context_set_language (context->context, pango_language_from_string (charset));
pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR); pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
@ -25,7 +32,7 @@
context->layout = pango_layout_new (context->context); context->layout = pango_layout_new (context->context);
@@ -762,6 +756,17 @@ @@ -762,6 +756,17 @@ SDLPango_CreateContext()
} }
/*! /*!
@ -43,7 +50,7 @@
Free a context. Free a context.
@param *context [i/o] Context to be free @param *context [i/o] Context to be free
@@ -1053,6 +1058,20 @@ @@ -1053,6 +1058,20 @@ SDLPango_SetMarkup(
pango_layout_set_font_description (context->layout, context->font_desc); pango_layout_set_font_description (context->layout, context->font_desc);
} }
@ -64,7 +71,7 @@
/*! /*!
Set plain text to context. Set plain text to context.
Text must be utf-8. Text must be utf-8.
@@ -1067,11 +1086,7 @@ @@ -1067,11 +1086,7 @@ SDLPango_SetText(
const char *text, const char *text,
int length) int length)
{ {
@ -77,9 +84,11 @@
} }
/*! /*!
--- src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100 Index: SDL_Pango-0.1.2/src/SDL_Pango.h
+++ src/SDL_Pango.h 2006-09-24 22:46:01.000000000 +0200 ===================================================================
@@ -109,12 +109,20 @@ --- SDL_Pango-0.1.2.orig/src/SDL_Pango.h
+++ SDL_Pango-0.1.2/src/SDL_Pango.h
@@ -109,12 +109,20 @@ typedef enum {
SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */ SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */
} SDLPango_Direction; } SDLPango_Direction;
@ -101,7 +110,7 @@
extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext(); extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
extern DECLSPEC void SDLCALL SDLPango_FreeContext( extern DECLSPEC void SDLCALL SDLPango_FreeContext(
@@ -157,6 +165,12 @@ @@ -157,6 +165,12 @@ extern DECLSPEC void SDLCALL SDLPango_Se
const char *markup, const char *markup,
int length); int length);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 11 12:23:35 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Remove --with-pic (ineffective with --disable-static)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 11 07:35:31 UTC 2019 - Luigi Baldoni <aloisio@gmx.com> Sat May 11 07:35:31 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>

View File

@ -27,11 +27,10 @@ URL: http://sdlpango.sourceforge.net/
#CVS-Clone: -d:pserver:anonymous@sdlpango.cvs.sourceforge.net:/cvsroot/sdlpango co -P SDL_Pango #CVS-Clone: -d:pserver:anonymous@sdlpango.cvs.sourceforge.net:/cvsroot/sdlpango co -P SDL_Pango
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
# PATCH-FEATURE-UPSTREAM SDL_Pango-0.1.2-API-adds.patch Patch1: %name-%version-API-adds.patch
Patch0: %name-%version-API-adds.patch
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkg-config
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(sdl)
@ -64,13 +63,12 @@ This package contains all necessary include files and libraries needed
to develop applications that require these. to develop applications that require these.
%prep %prep
%setup -q %autosetup -p1
%patch0
dos2unix AUTHORS README dos2unix AUTHORS README
%build %build
autoreconf -fiv autoreconf -fiv
%configure --disable-static --with-pic %configure --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install