diff --git a/SDL_Pango-0.1.2-API-adds.patch b/SDL_Pango-0.1.2-API-adds.patch index f038353..34b1f9f 100644 --- a/SDL_Pango-0.1.2-API-adds.patch +++ b/SDL_Pango-0.1.2-API-adds.patch @@ -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 -@@ -723,13 +723,8 @@ +--- + src/SDL_Pango.c | 41 ++++++++++++++++++++++++++++------------- + 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); } @@ -15,7 +22,7 @@ { SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); 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_base_dir (context->context, PANGO_DIRECTION_LTR); @@ -25,7 +32,7 @@ context->layout = pango_layout_new (context->context); -@@ -762,6 +756,17 @@ +@@ -762,6 +756,17 @@ SDLPango_CreateContext() } /*! @@ -43,7 +50,7 @@ Free a context. @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); } @@ -64,7 +71,7 @@ /*! Set plain text to context. Text must be utf-8. -@@ -1067,11 +1086,7 @@ +@@ -1067,11 +1086,7 @@ SDLPango_SetText( const char *text, int length) { @@ -77,9 +84,11 @@ } /*! ---- src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100 -+++ src/SDL_Pango.h 2006-09-24 22:46:01.000000000 +0200 -@@ -109,12 +109,20 @@ +Index: SDL_Pango-0.1.2/src/SDL_Pango.h +=================================================================== +--- 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; @@ -101,7 +110,7 @@ extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext(); extern DECLSPEC void SDLCALL SDLPango_FreeContext( -@@ -157,6 +165,12 @@ +@@ -157,6 +165,12 @@ extern DECLSPEC void SDLCALL SDLPango_Se const char *markup, int length); diff --git a/SDL_Pango.changes b/SDL_Pango.changes index 7e32f06..21eb165 100644 --- a/SDL_Pango.changes +++ b/SDL_Pango.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 11 12:23:35 UTC 2019 - Jan Engelhardt + +- Remove --with-pic (ineffective with --disable-static) + ------------------------------------------------------------------- Sat May 11 07:35:31 UTC 2019 - Luigi Baldoni diff --git a/SDL_Pango.spec b/SDL_Pango.spec index e5e26cc..7fc0f3b 100644 --- a/SDL_Pango.spec +++ b/SDL_Pango.spec @@ -27,11 +27,10 @@ URL: http://sdlpango.sourceforge.net/ #CVS-Clone: -d:pserver:anonymous@sdlpango.cvs.sourceforge.net:/cvsroot/sdlpango co -P SDL_Pango Source: %name-%version.tar.bz2 Source2: baselibs.conf -# PATCH-FEATURE-UPSTREAM SDL_Pango-0.1.2-API-adds.patch -Patch0: %name-%version-API-adds.patch +Patch1: %name-%version-API-adds.patch BuildRequires: dos2unix BuildRequires: libtool -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(sdl) @@ -64,13 +63,12 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %prep -%setup -q -%patch0 +%autosetup -p1 dos2unix AUTHORS README %build autoreconf -fiv -%configure --disable-static --with-pic +%configure --disable-static make %{?_smp_mflags} %install