diff options
Diffstat (limited to 'desktop/cairo-compmgr/patches')
4 files changed, 350 insertions, 0 deletions
diff --git a/desktop/cairo-compmgr/patches/cairo-compmgr-fix-link.patch b/desktop/cairo-compmgr/patches/cairo-compmgr-fix-link.patch new file mode 100644 index 0000000000..5788fef309 --- /dev/null +++ b/desktop/cairo-compmgr/patches/cairo-compmgr-fix-link.patch @@ -0,0 +1,88 @@ +Index: cairo-compmgr-0.3.0/configure.ac +=================================================================== +--- cairo-compmgr-0.3.0.orig/configure.ac ++++ cairo-compmgr-0.3.0/configure.ac +@@ -81,6 +81,7 @@ PKG_CHECK_MODULES(CAIRO_COMPMGR, + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +Index: cairo-compmgr-0.3.0/configure +=================================================================== +--- cairo-compmgr-0.3.0.orig/configure ++++ cairo-compmgr-0.3.0/configure +@@ -13369,6 +13369,7 @@ if test -n "$PKG_CONFIG"; then + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, +@@ -13378,6 +13379,7 @@ if test -n "$PKG_CONFIG"; then + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +@@ -13390,6 +13392,7 @@ if test -n "$PKG_CONFIG"; then + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +@@ -13411,6 +13414,7 @@ if test -n "$PKG_CONFIG"; then + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, +@@ -13420,6 +13424,7 @@ if test -n "$PKG_CONFIG"; then + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +@@ -13432,6 +13437,7 @@ if test -n "$PKG_CONFIG"; then + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +@@ -13459,6 +13465,7 @@ fi + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +@@ -13469,6 +13476,7 @@ fi + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, +@@ -13482,6 +13490,7 @@ fi + xdamage, + xext, + xi, ++ x11, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, diff --git a/desktop/cairo-compmgr/patches/cairo-compmgr-link-gmodule.patch b/desktop/cairo-compmgr/patches/cairo-compmgr-link-gmodule.patch new file mode 100644 index 0000000000..ae9e9345fc --- /dev/null +++ b/desktop/cairo-compmgr/patches/cairo-compmgr-link-gmodule.patch @@ -0,0 +1,88 @@ +Index: cairo-compmgr-0.3.0/configure +=================================================================== +--- cairo-compmgr-0.3.0.orig/configure ++++ cairo-compmgr-0.3.0/configure +@@ -13372,6 +13372,7 @@ if test -n "$PKG_CONFIG"; then + sm, + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= \$GTK_REQUIRED + vala-1.0 >= \$VALA_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xcomposite, +@@ -13381,6 +13382,7 @@ if test -n "$PKG_CONFIG"; then + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED") 2>&5 + ac_status=$? +@@ -13393,6 +13395,7 @@ if test -n "$PKG_CONFIG"; then + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED" 2>/dev/null` + else +@@ -13414,6 +13417,7 @@ if test -n "$PKG_CONFIG"; then + sm, + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= \$GTK_REQUIRED + vala-1.0 >= \$VALA_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xcomposite, +@@ -13423,6 +13427,7 @@ if test -n "$PKG_CONFIG"; then + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED") 2>&5 + ac_status=$? +@@ -13435,6 +13440,7 @@ if test -n "$PKG_CONFIG"; then + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED" 2>/dev/null` + else +@@ -13462,6 +13468,7 @@ fi + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED"` + else +@@ -13472,6 +13479,7 @@ fi + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED"` + fi +@@ -13485,6 +13493,7 @@ fi + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED) were not met: + +Index: cairo-compmgr-0.3.0/configure.ac +=================================================================== +--- cairo-compmgr-0.3.0.orig/configure.ac ++++ cairo-compmgr-0.3.0/configure.ac +@@ -84,6 +84,7 @@ PKG_CHECK_MODULES(CAIRO_COMPMGR, + sm, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, ++ gmodule-2.0, + gtk+-2.0 >= $GTK_REQUIRED + vala-1.0 >= $VALA_REQUIRED]) + AC_SUBST(CAIRO_COMPMGR_CFLAGS) diff --git a/desktop/cairo-compmgr/patches/cairo-compmgr-link-libICE.patch b/desktop/cairo-compmgr/patches/cairo-compmgr-link-libICE.patch new file mode 100644 index 0000000000..54a2805064 --- /dev/null +++ b/desktop/cairo-compmgr/patches/cairo-compmgr-link-libICE.patch @@ -0,0 +1,90 @@ +http://cairo-compmgr.tuxfamily.org/bugs/index.php?do=details&task_id=80 + +Index: cairo-compmgr-0.3.0/configure +=================================================================== +--- cairo-compmgr-0.3.0.orig/configure ++++ cairo-compmgr-0.3.0/configure +@@ -13371,6 +13371,7 @@ if test -n "$PKG_CONFIG"; then + xi, + x11, + sm, ++ ice, + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13382,6 +13383,7 @@ if test -n "$PKG_CONFIG"; then + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13396,6 +13398,7 @@ if test -n "$PKG_CONFIG"; then + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13419,6 +13422,7 @@ if test -n "$PKG_CONFIG"; then + xi, + x11, + sm, ++ ice, + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13430,6 +13434,7 @@ if test -n "$PKG_CONFIG"; then + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13444,6 +13449,7 @@ if test -n "$PKG_CONFIG"; then + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13473,6 +13479,7 @@ fi + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13485,6 +13492,7 @@ fi + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +@@ -13500,6 +13508,7 @@ fi + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, +Index: cairo-compmgr-0.3.0/configure.ac +=================================================================== +--- cairo-compmgr-0.3.0.orig/configure.ac ++++ cairo-compmgr-0.3.0/configure.ac +@@ -83,6 +83,7 @@ PKG_CHECK_MODULES(CAIRO_COMPMGR, + xi, + x11, + sm, ++ ice, + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gmodule-2.0, diff --git a/desktop/cairo-compmgr/patches/fixup-vala-requirement.patch b/desktop/cairo-compmgr/patches/fixup-vala-requirement.patch new file mode 100644 index 0000000000..0115e16d0b --- /dev/null +++ b/desktop/cairo-compmgr/patches/fixup-vala-requirement.patch @@ -0,0 +1,84 @@ +diff -Nur cairo-compmgr-0.3.0.orig//configure cairo-compmgr-0.3.0/configure +--- cairo-compmgr-0.3.0.orig//configure 2010-03-17 17:13:42.000000000 -0500 ++++ cairo-compmgr-0.3.0/configure 2010-12-31 18:15:49.781205330 -0600 +@@ -13373,7 +13373,7 @@ + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, + gtk+-2.0 >= \$GTK_REQUIRED +- vala-1.0 >= \$VALA_REQUIRED\""; } >&5 ++ libvala-0.12 >= \$VALA_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xcomposite, + xdamage, + xext, +@@ -13382,7 +13382,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED") 2>&5 ++ libvala-0.12 >= $VALA_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +@@ -13394,7 +13394,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED" 2>/dev/null` ++ libvala-0.12 >= $VALA_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13415,7 +13415,7 @@ + cairo >= \$CAIRO_REQUIRED, + pixman-1 >= \$PIXMAN_REQUIRED, + gtk+-2.0 >= \$GTK_REQUIRED +- vala-1.0 >= \$VALA_REQUIRED\""; } >&5 ++ libvala-0.12 >= \$VALA_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xcomposite, + xdamage, + xext, +@@ -13424,7 +13424,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED") 2>&5 ++ libvala-0.12 >= $VALA_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +@@ -13436,7 +13436,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED" 2>/dev/null` ++ libvala-0.12 >= $VALA_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13463,7 +13463,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED"` ++ libvala-0.12 >= $VALA_REQUIRED"` + else + CAIRO_COMPMGR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcomposite, + xdamage, +@@ -13473,7 +13473,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED"` ++ libvala-0.12 >= $VALA_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CAIRO_COMPMGR_PKG_ERRORS" >&5 +@@ -13486,7 +13486,7 @@ + cairo >= $CAIRO_REQUIRED, + pixman-1 >= $PIXMAN_REQUIRED, + gtk+-2.0 >= $GTK_REQUIRED +- vala-1.0 >= $VALA_REQUIRED) were not met: ++ libvala-0.12 >= $VALA_REQUIRED) were not met: + + $CAIRO_COMPMGR_PKG_ERRORS + |