[Pkg-e-devel] Bug#713629: Patch for the FTBFS

[Andreas Moog]

Control: tags -1 + patch

Hello David, Hello Debian pkg-e Team,

please find attached a debdiff with a possible fix for the buildfailure.

Cheers,
  Andreas
-------------- next part --------------
diff -Nru elementary-0.7.0.55225/debian/changelog elementary-0.7.0.55225/debian/changelog
--- elementary-0.7.0.55225/debian/changelog	2011-06-19 17:24:59.000000000 +0000
+++ elementary-0.7.0.55225/debian/changelog	2013-08-28 11:47:50.000000000 +0000
@@ -1,3 +1,13 @@
+elementary (0.7.0.55225-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update debian/patches/01_fix_linkage patch to also pas -lm to the linker.
+    (Closes: #713629)
+  * Add debian/patches/02_edje_clip_to_pointer.patch from upstream git to
+    fix errors during the edje compilation.
+
+ -- Andreas Moog <amoog at ubuntu.com>  Wed, 28 Aug 2013 11:31:50 +0000
+
 elementary (0.7.0.55225-1) unstable; urgency=low
 
   * New upstream snapshot
diff -Nru elementary-0.7.0.55225/debian/patches/01_fix_linkage.diff elementary-0.7.0.55225/debian/patches/01_fix_linkage.diff
--- elementary-0.7.0.55225/debian/patches/01_fix_linkage.diff	2011-06-19 17:24:59.000000000 +0000
+++ elementary-0.7.0.55225/debian/patches/01_fix_linkage.diff	2013-08-28 11:28:56.000000000 +0000
@@ -7,7 +7,7 @@
  test_store.c
  
 -elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
-+elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_LIBS@
++elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_LIBS@ -lm
  elementary_test_LDFLAGS =
  
  elementary_config_SOURCES = \
@@ -33,7 +33,7 @@
  test_store.c
  
 -elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
-+elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_LIBS@
++elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_LIBS@ -lm
  elementary_test_LDFLAGS = 
  elementary_config_SOURCES = \
  config.c
diff -Nru elementary-0.7.0.55225/debian/patches/02_edje_clip_to_point.diff elementary-0.7.0.55225/debian/patches/02_edje_clip_to_point.diff
--- elementary-0.7.0.55225/debian/patches/02_edje_clip_to_point.diff	1970-01-01 00:00:00.000000000 +0000
+++ elementary-0.7.0.55225/debian/patches/02_edje_clip_to_point.diff	2013-08-28 11:46:55.000000000 +0000
@@ -0,0 +1,64 @@
+Description: Fix "Can't clip to point" error during compilation
+Author: Michael Bouchaud, michael.bouchaud at gmail.com
+Origin: upstream, multiple commits, http://git.enlightenment.org/core/elementary.git/commit/data/themes/default.edc?id=6152794416ba41138d2bbab2083acd3f1b1dfd78
+Bug-Debian: http://bugs.debian.org/713629
+Last-Update: <2013-08-28>
+
+--- elementary-0.7.0.55225.orig/data/themes/default.edc
++++ elementary-0.7.0.55225/data/themes/default.edc
+@@ -11383,6 +11383,7 @@ collections {
+             }
+          }
+          part { name: "image_1_whole";
++                type: RECT;
+             description {
+                state: "default" 0.0;
+                color: 255 255 255 255;
+@@ -11449,6 +11450,7 @@ collections {
+             }
+          }
+          part { name: "image_2_whole";
++                type: RECT;
+             description {
+                state: "default" 0.0;
+                visible: 1;
+@@ -26175,6 +26177,7 @@ collections {
+       parts {
+          part { name: "elm.background.progressbar";
+             mouse_events: 0;
++                type: RECT;
+             description {
+                state: "default" 0.0;
+                rel1 {
+@@ -26442,6 +26445,7 @@ collections {
+          }
+          part { name: "progress-rect";
+             mouse_events: 0;
++                type: RECT;
+             description {
+                state: "default" 0.0;
+                rel1.to: "elm.progress.progressbar";
+@@ -30620,6 +30624,7 @@ collections {
+         }
+         parts {
+             part { name: "whole";
++                type: RECT;
+                 description { state: "default" 0.0;
+                 }
+             }
+@@ -30730,6 +30735,7 @@ collections {
+         }
+         parts {
+             part { name: "whole";
++                type: RECT;
+                 description { state: "default" 0.0;
+                 }
+             }
+@@ -30790,6 +30796,7 @@ collections {
+     parts {
+     part { name: "clipper";
+         mouse_events:  1;
++                type: RECT;
+         description { state: "default" 0.0;
+           color: 255 255 255 0;
+         }
diff -Nru elementary-0.7.0.55225/debian/patches/series elementary-0.7.0.55225/debian/patches/series
--- elementary-0.7.0.55225/debian/patches/series	2011-06-19 17:24:59.000000000 +0000
+++ elementary-0.7.0.55225/debian/patches/series	2013-08-28 11:48:08.000000000 +0000
@@ -1 +1,2 @@
 01_fix_linkage.diff
+02_edje_clip_to_point.diff
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-e-devel/attachments/20130828/d76676fd/attachment.sig>