diff --git a/sawfish-1.9.0-no-pangox.patch b/sawfish-1.9.0-no-pangox.patch deleted file mode 100644 index 8b138e7..0000000 --- a/sawfish-1.9.0-no-pangox.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up sawfish-1.9.0/configure.in.jx sawfish-1.9.0/configure.in ---- sawfish-1.9.0/configure.in.jx 2012-06-26 16:50:43.000000000 -0400 -+++ sawfish-1.9.0/configure.in 2012-08-27 12:16:42.784057848 -0400 -@@ -202,10 +202,6 @@ PKG_CHECK_MODULES(PANGO, pango >= ${PANG - ,AC_DEFINE(HAVE_PANGO, 1, [Have pango]) FONT_LOADER="Pango" - ,AC_MSG_ERROR([cannot locate pango >= $PANGO_MIN_VER])) - --PKG_CHECK_MODULES(PANGOX, pangox >= ${PANGO_MIN_VER} -- ,AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox]) PANGO_MODULES="${PANGO_MODULES} pangox" FONT_LOADER="Pango X" -- ,AC_MSG_WARN([pango x support not available >= $PANGO_MIN_VER])) -- - PKG_CHECK_MODULES(PANGOXFT, pangoxft >= ${PANGO_MIN_VER} - ,AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft]) PANGO_MODULES="${PANGO_MODULES} pangoxft" have_pango_xft="yes" FONT_LOADER="Pango XFT" AC_SUBST(have_pango_xft) - ,AC_MSG_WARN([pango xft support not available $PANGO_MIN_VER])) -diff -up sawfish-1.9.0/src/fonts.c.jx sawfish-1.9.0/src/fonts.c ---- sawfish-1.9.0/src/fonts.c.jx 2012-06-26 16:50:45.000000000 -0400 -+++ sawfish-1.9.0/src/fonts.c 2012-08-27 12:30:31.596323616 -0400 -@@ -53,9 +53,6 @@ - # define PANGO_ENABLE_BACKEND - # include - # undef PANGO_ENABLE_BACKEND --# ifdef HAVE_PANGO_X --# include --# endif - # ifdef HAVE_PANGO_XFT - # define PANGO_ENABLE_ENGINE - # include -@@ -429,8 +426,6 @@ pango_load (Lisp_Font *f) - - #ifdef HAVE_PANGO_XFT - pango_context = pango_xft_get_context (dpy, screen_num); --#else -- pango_context = pango_x_get_context (dpy, screen_num); - #endif - - langname = g_strdup (setlocale (LC_CTYPE, NULL)); -@@ -514,9 +509,7 @@ pango_draw_line (XftDraw *draw, Window i - #ifdef HAVE_PANGO_XFT - if (PANGO_XFT_IS_FONT (font)) - pango_xft_render (draw, xft_color, font, glyphs, x, y); -- else - #endif -- pango_x_render (dpy, id, gc, font, glyphs, x, y); - - x += rect.width / PANGO_SCALE; - } diff --git a/sawfish.spec b/sawfish.spec index d862849..b16abba 100644 --- a/sawfish.spec +++ b/sawfish.spec @@ -1,6 +1,6 @@ Summary: An extensible window manager for the X Window System Name: sawfish -Version: 1.9.1 +Version: 1.9.90 Release: 1%{?dist} License: GPLv2+ and Artistic 2.0 # GPLv2+ is for Sawfish @@ -9,8 +9,6 @@ Group: User Interface/Desktops Source0: http://download.tuxfamily.org/%{name}/%{name}-%{version}.tar.bz2 URL: http://sawfish.wikia.com/ -Patch0: sawfish-1.9.0-no-pangox.patch - BuildRequires: gmp-devel BuildRequires: gtk2-devel BuildRequires: libXft-devel @@ -21,12 +19,12 @@ BuildRequires: texinfo BuildRequires: gettext BuildRequires: kde-filesystem BuildRequires: desktop-file-utils -BuildRequires: librep-devel >= 0.92.1 +BuildRequires: librep-devel >= 0.92.3 BuildRequires: rep-gtk-devel >= 0.90.7 Requires: control-center-filesystem Requires: hicolor-icon-theme Requires: kde-filesystem -Requires: librep >= 0.92.1 +Requires: librep >= 0.92.3 Requires: rep-gtk >= 0.90.7 %define rep_execdir %(pkg-config librep --variable=repcommonexecdir) @@ -49,7 +47,6 @@ Include files for Sawfish development. %prep %setup -q -%patch0 -p1 -b .no-pangox %build %configure @@ -104,6 +101,9 @@ fi # This is sawfish GUI configurator, not devel config script. %changelog +* Thu Jan 17 2013 Kim B. Heino - 1.9.90-1 +- Update to 1.9.90 + * Sun Nov 11 2012 Kim B. Heino - 1.9.1-1 - Update to 1.9.1 diff --git a/sources b/sources index 9776a51..d6fa456 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e174cb7a08fd1d76e0028ff08049d04 sawfish-1.9.1.tar.bz2 +3d1003cafc6f5a7e1acc4861707e4f1d sawfish-1.9.90.tar.bz2