diff --git a/desktop/toolkit/gtk/cairo/actions.py b/desktop/toolkit/gtk/cairo/actions.py new file mode 100644 index 0000000000..f7bc4bd107 --- /dev/null +++ b/desktop/toolkit/gtk/cairo/actions.py @@ -0,0 +1,37 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + pisitools.flags.add("-flto -ffat-lto-objects") + autotools.autoreconf("-vfi") + autotools.configure("--disable-static \ + --enable-xlib \ + --enable-ft \ + --enable-ps \ + --enable-pdf \ + --enable-svg \ + --enable-tee \ + --enable-gl \ + --enable-gobject \ + --disable-gtk-doc") + + pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""') + pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE") + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.removeDir("/usr/share/gtk-doc") + pisitools.dodoc("AUTHORS", "README", "ChangeLog", "NEWS", "COPYING", "COPYING-LGPL-2.1", "COPYING-MPL-1.1") diff --git a/desktop/toolkit/gtk/cairo/files/0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch b/desktop/toolkit/gtk/cairo/files/0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch new file mode 100644 index 0000000000..c94d7b32c1 --- /dev/null +++ b/desktop/toolkit/gtk/cairo/files/0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch @@ -0,0 +1,43 @@ +From 8dc3b629434ce256f8e6a584c5853ae9b4230c33 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 31 Oct 2012 16:06:51 -0400 +Subject: [PATCH 1/2] xlib: Don't crash when swapping a 0-sized glyph + +malloc(0) needn't return NULL, and on glibc, doesn't. Then we encounter +a loop of the form do { ... } while (--c), which doesn't do quite what +you were hoping for when c is initially 0. + +Since there's nothing to swap in this case, just bomb out. + +Signed-off-by: Adam Jackson +--- + src/cairo-xlib-render-compositor.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/cairo-xlib-render-compositor.c b/src/cairo-xlib-render-compositor.c +index 74c43e9..e38a659 100644 +--- a/src/cairo-xlib-render-compositor.c ++++ b/src/cairo-xlib-render-compositor.c +@@ -1251,6 +1251,9 @@ _cairo_xlib_surface_add_glyph (cairo_xlib_display_t *display, + unsigned char *d; + unsigned char *new, *n; + ++ if (c == 0) ++ break; ++ + new = malloc (c); + if (!new) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); +@@ -1276,6 +1279,9 @@ _cairo_xlib_surface_add_glyph (cairo_xlib_display_t *display, + const uint32_t *d; + uint32_t *new, *n; + ++ if (c == 0) ++ break; ++ + new = malloc (4 * c); + if (unlikely (new == NULL)) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); +-- +1.7.12.1 + diff --git a/desktop/toolkit/gtk/cairo/files/0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch b/desktop/toolkit/gtk/cairo/files/0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch new file mode 100644 index 0000000000..7d2b40554e --- /dev/null +++ b/desktop/toolkit/gtk/cairo/files/0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch @@ -0,0 +1,43 @@ +From 4cad9bf9f0744efe17f1b70548cd2059df071e81 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 31 Oct 2012 16:12:58 -0400 +Subject: [PATCH 2/2] xcb: Don't crash when swapping a 0-sized glyph + +malloc(0) needn't return NULL, and on glibc, doesn't. Then we encounter +a loop of the form do { ... } while (--c), which doesn't do quite what +you were hoping for when c is initially 0. + +Since there's nothing to swap in this case, just bomb out. + +Signed-off-by: Adam Jackson +--- + src/cairo-xcb-surface-render.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c +index 27ed113..16d1ef8 100644 +--- a/src/cairo-xcb-surface-render.c ++++ b/src/cairo-xcb-surface-render.c +@@ -4461,6 +4461,9 @@ _cairo_xcb_surface_add_glyph (cairo_xcb_connection_t *connection, + const uint8_t *d; + uint8_t *new, *n; + ++ if (c == 0) ++ break; ++ + new = malloc (c); + if (unlikely (new == NULL)) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); +@@ -4489,6 +4492,9 @@ _cairo_xcb_surface_add_glyph (cairo_xcb_connection_t *connection, + const uint32_t *d; + uint32_t *new, *n; + ++ if (c == 0) ++ break; ++ + new = malloc (4 * c); + if (unlikely (new == NULL)) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); +-- +1.7.12.1 + diff --git a/desktop/toolkit/gtk/cairo/files/git_fixes.diff b/desktop/toolkit/gtk/cairo/files/git_fixes.diff new file mode 100644 index 0000000000..93af054eef --- /dev/null +++ b/desktop/toolkit/gtk/cairo/files/git_fixes.diff @@ -0,0 +1,33 @@ +From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001 +From: Massimo Valentini +Date: Sun, 19 Oct 2014 09:19:10 +0200 +Subject: tor-scan-converter: can't do_fullrow when intersection in row + + 0.5subrow + +the active edges list must be left sorted at the next possible use +and since full_row does not deal with intersections it is not usable +when there is an intersection in the top half of the next row first +subrow + +Reported-and-tested-by: Matthew Leach +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151 +Reviewed-by: Chris Wilson + +diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c +index 4adcafb..14922d0 100644 +--- a/src/cairo-tor-scan-converter.c ++++ b/src/cairo-tor-scan-converter.c +@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active) + + if (e->dy) { + struct quorem x = e->x; +- x.quo += e->dxdy_full.quo - e->dxdy.quo/2; +- x.rem += e->dxdy_full.rem - e->dxdy.rem/2; ++ x.quo += e->dxdy_full.quo; ++ x.rem += e->dxdy_full.rem; + if (x.rem < 0) { + x.quo--; + x.rem += e->dy; +-- +cgit v0.10.2 + diff --git a/desktop/toolkit/gtk/cairo/pspec.xml b/desktop/toolkit/gtk/cairo/pspec.xml new file mode 100644 index 0000000000..3cfc351b96 --- /dev/null +++ b/desktop/toolkit/gtk/cairo/pspec.xml @@ -0,0 +1,198 @@ + + + + + cairo + http://cairographics.org + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + MPL-1.1 + library + 2D graphics library with bindings of many programming languages + Cairo is a 2D graphics library with support for multiple output devices (and fileformats). + http://cairographics.org/releases/cairo-1.14.2.tar.xz + + zlib-devel + glib2-devel + libX11-devel + libpng-devel + libxcb-devel + freetype-devel + libgcc + fontconfig-devel + libXrender-devel + pixman-devel + xcb-util-devel + libXext-devel + mesa-devel + + + + + + + + + + + + cairo + + zlib + glib2 + libX11 + libpng + libxcb + freetype + libgcc + fontconfig + libXrender + pixman + libXext + mesa + lzo + + + /usr/bin + /usr/share/man + /usr/share/doc + /usr/share/gtk-doc + /usr/share/info + /usr/lib + + + + + cairo-devel + Development files for cairo + + cairo + mesa-devel + pixman-devel + libXext-devel + fontconfig-devel + libXrender-devel + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + cairo-32bit + emul32 + 32-bit shared libraries for cairo + emul32 + + lzo-32bit + mesa-32bit + zlib-32bit + glib2-32bit + libX11-32bit + pixman-32bit + libpng-32bit + libxcb-32bit + libXext-32bit + freetype-32bit + fontconfig-32bit + libXrender-32bit + + + + cairo + mesa-32bit + zlib-32bit + glib2-32bit + libX11-32bit + pixman-32bit + libpng-32bit + libxcb-32bit + libXext-32bit + freetype-32bit + fontconfig-32bit + libXrender-32bit + lzo-32bit + + + /usr/lib32/lib* + /usr/lib32/cairo + + + + + + 2015-04-18 + 1.14.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-01-28 + 1.14.0 + Version bump. + Ergün Salman + Poyraz76@pisilinux.org + + + 2014-05-17 + 1.12.16 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2013-10-09 + 1.12.16 + Version bump, fixes. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-29 + 1.12.14 + Fix dependencies. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-23 + 1.12.14 + Dep fixed + PisiLinux Community + admins@pisilinux.org + + + 2013-02-24 + 1.12.14 + Version bump, missing dep. + Ertan Güven + ertan@pisilinux.org + + + 2013-01-22 + 1.12.10 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-23 + 1.12.8 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/desktop/toolkit/gtk/cairo/translations.xml b/desktop/toolkit/gtk/cairo/translations.xml new file mode 100644 index 0000000000..f944d55157 --- /dev/null +++ b/desktop/toolkit/gtk/cairo/translations.xml @@ -0,0 +1,18 @@ + + + + cairo + Birden çok çıktı cihazına destek veren bir 2 boyutlu grafik kitaplığı + Cairo est une librairie graphique 2D supportant de nombreux périphériques de sortie. + + + + cairo-devel + cairo için geliştirme dosyaları + + + + cairo-32bit + cairo için 32-bit paylaşımlı kitaplıklar + + diff --git a/desktop/toolkit/gtk/pango/actions.py b/desktop/toolkit/gtk/pango/actions.py new file mode 100644 index 0000000000..bb26feb83e --- /dev/null +++ b/desktop/toolkit/gtk/pango/actions.py @@ -0,0 +1,37 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + + +def setup(): + if get.buildTYPE()=="emul32": + pisitools.dosed("pango/modules.c", "(pango\.modules)", r"\1-32") + autotools.autoreconf("-fiv") + autotools.configure("--disable-static \ + --sysconfdir=/etc \ + --with-included-modules=basic-fc \ + --%sable-introspection" % ("dis" if get.buildTYPE()=="emul32" else "en")) + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + if get.buildTYPE()=="emul32": + shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32") + pisitools.dobin("pango/.libs/pango-querymodules-32") + return + + pisitools.dodir("/etc/pango") + shelltools.touch(get.installDIR() +"/etc/pango/pango.modules") + + pisitools.dodoc("AUTHORS", "ChangeLog*", "COPYING", "README", "NEWS") diff --git a/desktop/toolkit/gtk/pango/comar/package.py b/desktop/toolkit/gtk/pango/comar/package.py new file mode 100644 index 0000000000..e3eebd3b5b --- /dev/null +++ b/desktop/toolkit/gtk/pango/comar/package.py @@ -0,0 +1,10 @@ +#!/usr/bin/python + +import os + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + f = open("/etc/pango/pango.modules", "w") + p = os.popen("/usr/bin/pango-querymodules", "r") + f.writelines(p.readlines()) + f.close() + p.close() diff --git a/desktop/toolkit/gtk/pango/files/pango-1.32.1-lib64.patch b/desktop/toolkit/gtk/pango/files/pango-1.32.1-lib64.patch new file mode 100644 index 0000000000..0820c78f12 --- /dev/null +++ b/desktop/toolkit/gtk/pango/files/pango-1.32.1-lib64.patch @@ -0,0 +1,44 @@ +From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 28 Oct 2012 23:19:39 +0100 +Subject: [PATCH] Add multilib support + +pango.modules list modules specific to a host architecture. +Add host triplet in path so that machine able to run multiple +triplet have a proper file per pango library. +--- + pango/Makefile.am | 1 + + pango/pango-utils.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pango/Makefile.am b/pango/Makefile.am +index ab092c9..558108b 100644 +--- a/pango/Makefile.am ++++ b/pango/Makefile.am +@@ -17,6 +17,7 @@ INCLUDES = \ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DLIBDIR=\"$(libdir)\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +diff --git a/pango/pango-utils.c b/pango/pango-utils.c +index 18ffa26..3b88f15 100644 +--- a/pango/pango-utils.c ++++ b/pango/pango-utils.c +@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void) + #else + const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR"); + if (sysconfdir != NULL) +- tmp_result = g_build_filename (sysconfdir, "pango", NULL); ++ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL); + else +- tmp_result = SYSCONFDIR "/pango"; ++ tmp_result = SYSCONFDIR "/pango/" HOST; + #endif + g_once_init_leave((gsize*)&result, (gsize)tmp_result); + } +-- +1.7.12.4 + diff --git a/desktop/toolkit/gtk/pango/pspec.xml b/desktop/toolkit/gtk/pango/pspec.xml new file mode 100644 index 0000000000..b9b19eb868 --- /dev/null +++ b/desktop/toolkit/gtk/pango/pspec.xml @@ -0,0 +1,202 @@ + + + + + pango + http://www.pango.org + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + FTL + library + Text rendering and layout library + Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. + mirrors://gnome/pango/1.36/pango-1.36.8.tar.xz + + gtk-doc + glib2-devel + libX11-devel + freetype-devel + cairo-devel + libXft-devel + harfbuzz-devel + fontconfig-devel + libXrender-devel + + + pango-1.32.1-lib64.patch + + + + + pango + + glib2 + libX11 + freetype + cairo + libXft + harfbuzz + + fontconfig + libXrender + + + /etc/pango + /usr/bin + /usr/lib/libpango* + /usr/lib/girepository-1.0 + /usr/lib/pango + /usr/share/gir-1.0 + /usr/share/man + /usr/share/doc + + + System.Package + + + + + pango-devel + Development files for pango + + pango + cairo-devel + libXft-devel + harfbuzz-devel + fontconfig-devel + + + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/include + + + + + pango-docs + data:doc + Pango reference documents + + /usr/share/gtk-doc + + + + + pango-32bit + emul32 + 32-bit shared libraries for pango + emul32 + + cairo-32bit + glib2-32bit + libX11-32bit + libXft-32bit + freetype-32bit + libXrender-32bit + fontconfig-32bit + libffi-32bit + harfbuzz-32bit + + + pango + cairo-32bit + glib2-32bit + libX11-32bit + libXft-32bit + freetype-32bit + libXrender-32bit + fontconfig-32bit + libffi-32bit + harfbuzz-32bit + + + /usr/bin/pango-querymodules-32 + /usr/lib32/libpango* + /usr/lib32/girepository-1.0 + /usr/lib32/pango + + + + + + 2015-03-18 + 1.36.8 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-07-07 + 1.36.5 + Version Bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-17 + 1.36.3 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-03-30 + 1.36.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-05 + 1.36.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-10 + 1.36.0 + Version bump, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-17 + 1.34.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-20 + 1.34.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-07 + 1.32.6 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-22 + 1.32.5 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2011-07-07 + 1.30.1 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/desktop/toolkit/gtk/pango/translations.xml b/desktop/toolkit/gtk/pango/translations.xml new file mode 100644 index 0000000000..2e786da1de --- /dev/null +++ b/desktop/toolkit/gtk/pango/translations.xml @@ -0,0 +1,24 @@ + + + + pango + Metin görüntüleme kitaplığı + Outil de positionnement et de rendu de texte. + Pango, özellikle yerelleştirme ile birlikte metin düzenlemek ve biçimlendirmek için bir kitaplıktır. Pango metin biçimlendirmenin gerekli olduğu her yerde kullanılabilir ama şimdiye kadar ki birçok Pango çalışması GTK+ araç takımının parçası ile tamamlandı. Pango formları, GTK+-2.x. için temel metin ve yazı tipini yönetir. + + + + pango-docs + Pango referans dokümanları + + + + pango-devel + pango için geliştirme dosyaları + + + + pango-32bit + pango için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml index ef9d67419b..04e8daed24 100755 --- a/x11/library/mesa/pspec.xml +++ b/x11/library/mesa/pspec.xml @@ -15,6 +15,7 @@ Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. ftp://ftp.freedesktop.org/pub/mesa/10.5.5/mesa-10.5.5.tar.gz + llvm llvm-libs llvm-clang-devel xorg-proto @@ -43,9 +44,9 @@ llvm-libs llvm-clang - libX11 - libgcc - libxcb + libX11 + libgcc + libxcb expat libdrm libXext @@ -122,8 +123,8 @@ glibc-32bit - libgcc - libcxb-32bit + libgcc + libxcb-32bit expat-32bit libX11-32bit libdrm-32bit