5 files changed, 8 insertions, 31 deletions

diff --git a/net-im/corebird/files/patch-Makefile.am b/net-im/corebird/files/patch-Makefile.am
index 03bb1b67a571..2c5681db3deb 100644
--- a/net-im/corebird/files/patch-Makefile.am
+++ b/net-im/corebird/files/patch-Makefile.am
@@ -3,7 +3,7 @@
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
--SUBDIRS = src ui data assets po tests sql examples
+-SUBDIRS = src ui data assets po tests sql
 +SUBDIRS = src ui data assets po sql
  EXTRA_DIST = config.rpath  \
  						 intltool-extract.in \
diff --git a/net-im/corebird/files/patch-configure.ac b/net-im/corebird/files/patch-configure.ac
index 9af2fdc7a3cf..316169b1bf70 100644
--- a/net-im/corebird/files/patch-configure.ac
+++ b/net-im/corebird/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2015-02-06 09:22:54.000000000 +0100
-+++ configure.ac	2015-03-01 14:48:09.000000000 +0100
+--- configure.ac.orig	2015-03-19 18:38:24.000000000 +0100
++++ configure.ac	2015-03-30 18:09:54.490239000 +0200
 @@ -93,8 +93,6 @@
  GETTEXT_PACKAGE=corebird
  AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
@@ -15,6 +15,6 @@
                   data/Makefile
 -                 data/org.baedert.corebird.desktop.in
 +                 data/corebird.desktop.in
-                  data/symbolics/Makefile
-                  examples/Makefile
                   assets/Makefile
+                  assets/128x128/Makefile
+                  assets/96x96/Makefile
diff --git a/net-im/corebird/files/patch-data__Makefile.am b/net-im/corebird/files/patch-data__Makefile.am
index 38ffe32bc051..71182ef027af 100644
--- a/net-im/corebird/files/patch-data__Makefile.am
+++ b/net-im/corebird/files/patch-data__Makefile.am
@@ -1,7 +1,6 @@
---- ./data/Makefile.am.orig	2014-07-07 08:38:31.000000000 +0000
-+++ ./data/Makefile.am	2014-08-09 23:10:47.000000000 +0000
-@@ -2,7 +2,7 @@
- SUBDIRS = symbolics
+--- data/Makefile.am.orig	2015-03-19 18:38:24.000000000 +0100
++++ data/Makefile.am	2015-03-30 18:12:15.956014000 +0200
+@@ -1,6 +1,6 @@
  
  desktopdir = $(prefix)/share/applications
 -desktop_in_files = org.baedert.corebird.desktop.in
diff --git a/net-im/corebird/files/patch-data__symbolics__Makefile.am b/net-im/corebird/files/patch-data__symbolics__Makefile.am
deleted file mode 100644
index cc8e3dba9be1..000000000000
--- a/net-im/corebird/files/patch-data__symbolics__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./data/symbolics/Makefile.am.orig	2014-07-07 08:38:31.000000000 +0000
-+++ ./data/symbolics/Makefile.am	2014-08-09 22:24:03.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
--symbolicsdir = $(prefix)/share/corebird/assets/hicolor/scalable/actions/
-+symbolicsdir = $(prefix)/share/icons/hicolor/scalable/actions/
- 
- symbolics_DATA = \
- 								corebird-conversation-symbolic.svg \
diff --git a/net-im/corebird/files/patch-src__widgets__MediaVideoWidget.vala b/net-im/corebird/files/patch-src__widgets__MediaVideoWidget.vala
deleted file mode 100644
index d742f00f5922..000000000000
--- a/net-im/corebird/files/patch-src__widgets__MediaVideoWidget.vala
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/widgets/MediaVideoWidget.vala.orig	2015-02-11 01:17:34.000000000 +0100
-+++ ./src/widgets/MediaVideoWidget.vala	2015-02-11 01:18:59.000000000 +0100
-@@ -34,7 +34,7 @@
-     drawing_area.realize.connect (realize_cb);
- #if VIDEO
-     this.src  = Gst.ElementFactory.make ("playbin", "video");
--    this.sink = Gst.ElementFactory.make ("vaapisink", "sink");
-+    this.sink = Gst.ElementFactory.make ("xvimagesink", "sink");
-     this.src.set ("video-sink", sink, null);
-     var bus = src.get_bus ();
-     bus.set_sync_handler (bus_sync_handler);