[arch-commits] Commit in pango/repos (3 files)

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 07:42:09
  Author: jgc
Revision: 493

Merged revisions 2-492 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pango/trunk

........
  r56 | jgc | 2008-04-10 17:07:24 +0000 (Thu, 10 Apr 2008) | 2 lines
  
  upgpkg: pango 1.20.2-1
      Remove unused patch, update to latest upstream version
........
  r155 | jgc | 2008-04-12 12:34:50 +0000 (Sat, 12 Apr 2008) | 2 lines
  
  upgpkg: pango 1.20.2-2
      Build with new cairo
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  pango/repos/extra-i686/	(properties)
  pango/repos/extra-i686/PKGBUILD
Deleted:
  pango/repos/extra-i686/pango-layout-indent-center.patch

----------------------------------+
 PKGBUILD                         |    8 ++++----
 pango-layout-indent-center.patch |   34 ----------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)


Property changes on: pango/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /pango/trunk:1
   + /pango/trunk:1-492

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 11:40:23 UTC (rev 492)
+++ extra-i686/PKGBUILD	2008-04-20 11:42:09 UTC (rev 493)
@@ -2,18 +2,18 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=pango
-pkgver=1.20.0
-pkgrel=1
+pkgver=1.20.2
+pkgrel=2
 pkgdesc="A library for layout and rendering of text"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glib2>=2.16.0' 'cairo>=1.4.14' 'libxft>=2.1.12' 'libthai>=0.1.9')
+depends=('glib2>=2.16.3' 'cairo>=1.6.4' 'libxft>=2.1.12' 'libthai>=0.1.9')
 makedepends=('pkgconfig' 'libxt')
 options=('!libtool' '!emptydirs')
 install=pango.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.20/${pkgname}-${pkgver}.tar.bz2)
 url="http://www.gtk.org/"
-md5sums=('f0959c4b9b058ba9e4d13fc9086b7e7d')
+md5sums=('b90d82bb5a92c7dd346c1eac97285e37')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}

Deleted: extra-i686/pango-layout-indent-center.patch
===================================================================
--- extra-i686/pango-layout-indent-center.patch	2008-04-20 11:40:23 UTC (rev 492)
+++ extra-i686/pango-layout-indent-center.patch	2008-04-20 11:42:09 UTC (rev 493)
@@ -1,34 +0,0 @@
---- branches/pango-1-18/pango/pango-layout.c	2007/10/15 20:12:47	2447
-+++ branches/pango-1-18/pango/pango-layout.c	2008/01/09 22:12:59	2540
-@@ -451,6 +451,9 @@
-  * of @indent will produce a hanging indentation. That is, the first line will
-  * have the full width, and subsequent lines will be indented by the
-  * absolute value of @indent.
-+ *
-+ * The indent setting is ignored if layout alignment is set to
-+ * %PANGO_ALIGN_CENTER.
-  **/
- void
- pango_layout_set_indent (PangoLayout *layout,
-@@ -3315,10 +3318,18 @@
- 
-   if (layout->ellipsize != PANGO_ELLIPSIZE_NONE)
-     state->remaining_width = -1;
--  else if (state->first_line)
--    state->remaining_width = (layout->indent >= 0) ? layout->width - layout->indent : layout->width;
-   else
--    state->remaining_width = (layout->indent >= 0) ? layout->width : layout->width + layout->indent;
-+    {
-+      state->remaining_width = layout->width;
-+  
-+      if (layout->alignment != PANGO_ALIGN_CENTER)
-+        {
-+	  if (state->first_line && layout->indent >= 0)
-+	    state->remaining_width -= layout->indent;
-+	  else if (!state->first_line && layout->indent < 0)
-+	    state->remaining_width += layout->indent;
-+        }
-+    }
-   DEBUG ("starting to fill line", line, state);
- 
-   while (state->items)