From a2f7e700c8b9d552835ac6d5d780ad3e4794feeb Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 11 Jul 2014 13:33:23 +0200 Subject: [PATCH] corebird: update to 0.8 --- srcpkgs/corebird/patches/various_fixes.diff | 55 --------------------- srcpkgs/corebird/template | 28 +++++------ 2 files changed, 11 insertions(+), 72 deletions(-) delete mode 100644 srcpkgs/corebird/patches/various_fixes.diff diff --git a/srcpkgs/corebird/patches/various_fixes.diff b/srcpkgs/corebird/patches/various_fixes.diff deleted file mode 100644 index 0aa823f15b9..00000000000 --- a/srcpkgs/corebird/patches/various_fixes.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff --git src/Corebird.vala src/Corebird.vala -index cf3c7c3..aebec51 100644 ---- src/Corebird.vala -+++ src/Corebird.vala -@@ -20,7 +20,7 @@ using Gtk; - class Corebird : Gtk.Application { - // TODO: Is the static here needed? - public static Sql.Database db; -- private static GLib.OutputStream log_stream; -+ //private static GLib.OutputStream log_stream; - public static GLib.Menu account_menu; - - const GLib.ActionEntry app_entries[] = { -@@ -237,12 +237,12 @@ class Corebird : Gtk.Application { - private void init_log_files () { // {{{ - /* First, create that log file */ - var now = new GLib.DateTime.now_local (); -- File log_file = File.new_for_path (Dirs.data ("logs/%s.txt".printf (now.to_string()))); -- try { -- log_stream = log_file.create(FileCreateFlags.REPLACE_DESTINATION); -- } catch (GLib.Error e) { -- warning ("Couldn't open log file: %s", e.message); -- } -+ //File log_file = File.new_for_path (Dirs.data ("logs/%s.txt".printf (now.to_string()))); -+ //try { -+ //log_stream = log_file.create(FileCreateFlags.REPLACE_DESTINATION); -+ //} catch (GLib.Error e) { -+ //warning ("Couldn't open log file: %s", e.message); -+ //} - /* If we do not run on the command line, we simply redirect stdout - to a log file*/ - GLib.Log.set_handler (null, LogLevelFlags.LEVEL_MESSAGE, print_to_log_file); -@@ -331,14 +331,14 @@ class Corebird : Gtk.Application { - else - out_string = "(%s) %s".printf (log_domain, msg); - -- if (log_stream != null) { -- try { -- log_stream.write_all (out_string.data, null); -- log_stream.flush (); -- } catch (GLib.Error e) { -- warning (e.message); -- } -- } -+ //if (log_stream != null) { -+ //try { -+ //log_stream.write_all (out_string.data, null); -+ //log_stream.flush (); -+ //} catch (GLib.Error e) { -+ //warning (e.message); -+ //} -+ //} - - #if !__DEV - if (flags != LogLevelFlags.LEVEL_DEBUG) diff --git a/srcpkgs/corebird/template b/srcpkgs/corebird/template index 7e257695b1c..90d92ea326c 100644 --- a/srcpkgs/corebird/template +++ b/srcpkgs/corebird/template @@ -1,28 +1,22 @@ # Template build for 'corebird'. pkgname=corebird -version=0.7 +version=0.8 revision=1 short_desc="Native Gtk+ Twitter Client" -hostmakedepends="pkg-config intltool cmake vala glib-devel libgee08-devel" +hostmakedepends="pkg-config intltool vala glib-devel libgee08-devel + autoconf automake libtool intltool" maintainer="Enno Boland " license="GPLv3" homepage="http://corebird.baedert.org/" distfiles="https://github.com/baedert/corebird/archive/${version}.tar.gz" -checksum=2f83d3b2d8792203dc92b644e333de0fb78947e366efc22d8d77e3f63cae1fd1 +checksum=4e68e174edc40b49d70a11c1b0a1b196ca9517daa8eae6ce2da3e8004acda611 makedepends="gtk+3-devel rest-devel libgee08-devel sqlite-devel - libsoup-devel libnotify-devel json-glib-devel" + libsoup-devel libnotify-devel json-glib-devel gettext-devel + gst-plugins-base1-devel" +build_style="gnu-configure" -# We cannot use build_style=cmake here because the build environment of -# corebird is broken. Therefore we do it manually - -do_configure() { - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON . -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install +pre_configure() { + autoreconf -i + intltoolize -f + autoreconf }