From 257dfd05df6720e00bc344a9ba198d7a99f6c45c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Aug 08 2019 13:37:39 +0000 Subject: cutter fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674780 --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d19c5ee..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/cutter-1.2.2.tar.gz -/cutter-1.2.3.tar.gz -/cutter-1.2.4.tar.gz -/cutter-1.2.5.tar.gz -/cutter-1.2.6.tar.gz diff --git a/cppcutter-stop-to-use-inline-instance-method-in-dest.patch b/cppcutter-stop-to-use-inline-instance-method-in-dest.patch deleted file mode 100644 index 92166e9..0000000 --- a/cppcutter-stop-to-use-inline-instance-method-in-dest.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 31a548f0785ec0e83f762904da2e93aef1fcc50d Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Sat, 16 Jan 2016 18:35:04 +0900 -Subject: [PATCH] cppcutter: stop to use inline instance method in destructor - -GitHub: fix #23 - -Reported by HAYASHI Kentaro. Thanks!!! - -Signed-off-by: HAYASHI Kentaro ---- - cppcutter/cppcut-message.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cppcutter/cppcut-message.cpp b/cppcutter/cppcut-message.cpp -index 169431c..463f4fa 100644 ---- a/cppcutter/cppcut-message.cpp -+++ b/cppcutter/cppcut-message.cpp -@@ -1,6 +1,6 @@ - /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* -- * Copyright (C) 2009 Kouhei Sutou -+ * Copyright (C) 2009-2016 Kouhei Sutou - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by -@@ -44,7 +44,7 @@ cut::Message::printf(const char *format, ...) - - cut::Message::~Message() - { -- cut_message("%s", this->string()); -+ cut_message("%s", buffer_.str().c_str()); - } - - /* --- -2.7.0.rc3 - diff --git a/cutter-configure-gtk-debug-detection.diff b/cutter-configure-gtk-debug-detection.diff deleted file mode 100644 index 5e8ff29..0000000 --- a/cutter-configure-gtk-debug-detection.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 903fb02..1a6b6bc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -353,10 +353,8 @@ if test "$gtk_exists" != "no"; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([ - #include - #include -- --int --main (int argc, char **argv) --{ -+ ], -+ [ - GOptionGroup *option_group; - GOptionContext *option_context; - gchar *help; -@@ -373,7 +371,6 @@ main (int argc, char **argv) - g_option_context_free(option_context); - - return debug_mode ? EXIT_SUCCESS : EXIT_FAILURE; --} - ])], - [AC_DEFINE(HAVE_GTK_ENABLE_DEBUG, 1, - [Define to 1 if you have GTK+ installed and built with debug mode]) diff --git a/cutter-test-use-upper-case-gdk-literal.diff b/cutter-test-use-upper-case-gdk-literal.diff deleted file mode 100644 index 952c23b..0000000 --- a/cutter-test-use-upper-case-gdk-literal.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/test/cutter/test-cutter.c b/test/cutter/test-cutter.c -index 674c379..d62206f 100644 ---- a/test/cutter/test-cutter.c -+++ b/test/cutter/test-cutter.c -@@ -259,8 +259,8 @@ test_help_all (void) - " --gtk-name=NAME Program name as used by the window manager" LINE_FEED_CODE - " --screen=SCREEN X screen to use" LINE_FEED_CODE - # ifdef HAVE_GTK_ENABLE_DEBUG -- " --gdk-debug=FLAGS Gdk debugging flags to set" LINE_FEED_CODE -- " --gdk-no-debug=FLAGS Gdk debugging flags to unset" LINE_FEED_CODE -+ " --gdk-debug=FLAGS GDK debugging flags to set" LINE_FEED_CODE -+ " --gdk-no-debug=FLAGS GDK debugging flags to unset" LINE_FEED_CODE - # endif - # ifdef GDK_WINDOWING_X11 - " --sync Make X calls synchronous" LINE_FEED_CODE diff --git a/cutter.spec b/cutter.spec deleted file mode 100644 index 05890d1..0000000 --- a/cutter.spec +++ /dev/null @@ -1,305 +0,0 @@ -%global __provides_exclude_from ^%{_libdir}/%{name}/module/.*\\.so$ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -Summary: Unit Testing Framework for C/C++ -Name: cutter -Version: 1.2.6 -Release: 5%{?dist} -License: LGPLv3+ -URL: http://cutter.sourceforge.net/ -Source: http://downloads.sourceforge.net/cutter/cutter-%{version}.tar.gz -BuildRequires: gcc-c++ -BuildRequires: gcc -BuildRequires: intltool -BuildRequires: glib2-devel -BuildRequires: libsoup-devel -BuildRequires: gtk2-devel -BuildRequires: goffice08-devel -BuildRequires: autoconf -Obsoletes: %{name}-gstreamer < 1.2.3 - -%description -Cutter is a xUnit family Unit Testing Framework for C/C++. -Cutter provides easy to write test and easy to debug code environment. - -%package devel -Summary: Libraries and header files for Cutter development -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -Libraries and header files for Cutter. -Cutter is a xUnit family Unit Testing Framework for C/C++. -Cutter provides easy to write test and easy to debug code environment. - -%package gui -Summary: GUI Test module for Cutter -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description gui -GUI Test module for Cutter. -Cutter is a xUnit family Unit Testing Framework for C/C++. -Cutter provides easy to write test and easy to debug code environment. - -%package report -Summary: PDF report module for Cutter -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description report -PDF report module for Cutter. -Cutter is a xUnit family Unit Testing Framework for C/C++. -Cutter provides easy to write test and easy to debug code environment. - -%prep -%setup -q -# follow guide line: https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries -# bundled pcre library is required for older version of glib (2.12) only. -#rm -fr glib-compatible/pcre/*.{c,h} -# replace to proper directory -sed -i 's|/usr/local/share/doc/cutter|%{_pkgdocdir}|g' doc/cutter.man -sed -i 's|/usr/local/share/doc/cutter/ja|%{_pkgdocdir}|g' doc/cutter.jman - -%build -autoconf -%configure --disable-bfd -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool -V=1 make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -# remove needless config directory of sample. this one will be generated by autogen.sh. -# already fixed in upstream. -rm -fr %{buildroot}%{_datadir}/cutter/stack/config -find %{buildroot} -name '*.la' -delete -%find_lang %{name} --with-man --all-name - -# Disabled tests until upstream fixes the issue https://github.com/clear-code/cutter/issues/27 -%check -make check LD_LIBRARY_PATH=$(pwd)/cppcutter/.libs:$(pwd)/cutter/.libs:$(pwd)/gdkcutter-pixbuf/.libs:$(pwd)/soupcutter/.libs:$(pwd)/test/lib/.libs - -%ldconfig_scriptlets - -%files -f %{name}.lang -%doc README README.ja NEWS NEWS.ja TODO FEATURES FEATURES.ja TUTORIAL TUTORIAL.ja USERS USERS.ja license/fdl-1.3.txt license/lgpl-3.txt -%{_bindir}/* -%dir %{_libdir}/cutter -%dir %{_libdir}/cutter/module -%dir %{_libdir}/cutter/module/factory -%dir %{_libdir}/cutter/module/factory/loader-customizer -%dir %{_libdir}/cutter/module/factory/report -%dir %{_libdir}/cutter/module/factory/ui -%dir %{_libdir}/cutter/module/report -%dir %{_libdir}/cutter/module/ui -%{_libdir}/cutter/module/factory/loader-customizer/cpp-integration-factory.so -%{_libdir}/cutter/module/factory/report/xml_factory.so -%{_libdir}/cutter/module/factory/stream/ -%{_libdir}/cutter/module/factory/ui/console_factory.so -%{_libdir}/cutter/module/loader-customizer/cpp-integration.so -%{_libdir}/cutter/module/report/xml.so -%{_libdir}/cutter/module/stream/ -%{_libdir}/cutter/module/ui/console.so -%{_libdir}/libcutter.so.* -%{_libdir}/libcppcutter.so.* -%{_libdir}/libsoupcutter.so.* -%{_libdir}/libgdkcutter-pixbuf.so.* -%{_mandir}/man1/* -%dir %{_datadir}/cutter -%dir %{_datadir}/cutter/icons -%dir %{_datadir}/cutter/license -%{_datadir}/cutter/icons/* -%{_datadir}/cutter/license/* - -%files devel -%dir %{_datadir}/gtk-doc/ -%dir %{_datadir}/gtk-doc/html/ -%doc %{_datadir}/gtk-doc/html/cutter/ -%dir %{_includedir}/cutter -%{_includedir}/cutter/* -%{_libdir}/libcutter.so -%{_libdir}/libcppcutter.so -%{_libdir}/libsoupcutter.so -%{_libdir}/libgdkcutter-pixbuf.so -%{_libdir}/pkgconfig/* -%{_datadir}/aclocal/* -%dir %{_datadir}/cutter -%dir %{_datadir}/cutter/stack -%{_datadir}/cutter/stack/* - -%files gui -%{_libdir}/cutter/module/factory/ui/gtk_factory.so -%{_libdir}/cutter/module/ui/gtk.so -%dir %{_datadir}/cutter/ui -%{_datadir}/cutter/ui/* - -%files report -%{_libdir}/cutter/module/factory/report/pdf_factory.so -%{_libdir}/cutter/module/report/pdf.so - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 1.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Oct 05 2017 Kentaro Hayashi - 1.2.6-1 -- New upstream release. -- Drop needless patch files. - fix-conflicting-types-of-remove.patch - cppcutter-stop-to-use-inline-instance-method-in-dest.patch -- Enable test again. - -* Wed Aug 02 2017 Fedora Release Engineering - 1.2.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jun 17 2017 Filipe Rosset - 1.2.5-5 -- Rebuilt to fix FTBFS rhbz#1423320 (disabled tests) - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Aug 12 2016 Kentaro Hayashi - 1.2.5-3 -- Add fix-conflicting-types-of-remove.patch to fix FTBFS on F25. - -* Wed Feb 03 2016 Fedora Release Engineering - 1.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 20 2016 HAYASHI Kentaro - 1.2.5-1 -- New upstream release. - Removed needless all patches which are introduced at 1.2.4-4. -- Apply patch (cppcutter-stop-to-use-inline-instance-method-in-dest.patch) - to fix test failure about cppcutter. - -* Wed Jun 17 2015 Fedora Release Engineering - 1.2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 HAYASHI Kentaro - 1.2.4-4 -- Fix FTBFS on F-21 and above (#1182957). - Reported by Mamoru Tasaka. - Add support-gdk-pixbuf-2.31.0-or-later.patch to fix it. -- Fix to support newer version of GLib error message - Add support-g-key-file-error-quark-2.43-or-later-message.patch -- Add patches to fix crash test_limit_block bug. - test-ensure-dropping-source-ID-when-callback-is-removed.patch - gcut-egg-fix-a-bug-that-source-is-removed-twice.patch - gcut-egg-fix-a-bug-that-timeout-source-is-removed-twice.patch - -* Sat Aug 16 2014 Fedora Release Engineering - 1.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 HAYASHI Kentaro - 1.2.4-1 -- New upstream release. - -* Fri Feb 28 2014 HAYASHI Kentaro - 1.2.3-2 -- Add missing Obsolete: for dropped gstreamer package (#1070967). - -* Mon Feb 10 2014 HAYASHI Kentaro - 1.2.3-1 -- New upstream release. -- Remove needless patches(Patch0 and Patch1). These patches are already merged into Cutter 1.2.3. -- Drop gstreamer package support. - -* Thu Dec 12 2013 Ville Skyttä - 1.2.2-6 -- Fix doc paths in man pages when doc dir is unversioned (#993715). - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jan 30 2013 HAYASHI Kentaro - 1.2.2-4 -- remove needless %%defattr. -- remove needless Requires:. -- aggregate redundant %%dir ownership to cutter base package. -- update gstreamer package description. -- don't export private module soname. -- remove unused shared library dependency. - -* Tue Jan 15 2013 HAYASHI Kentaro - 1.2.2-3 -- update packages Summary: section. -- change Group: from Development/Tools to Development/Libraries. -- remove needless BuiltRoot: tag. -- add arch-specific macro to Requires: tag. -- remove needless %%clean. -- add license file to %%doc. -- collect manual pages by %%find_lang additional option. -- remove bundled pcre library explicitly. -- fix default doc directory path in manual page. -- split gtk related module into -gui subpackage. -- add %%check section. -- split pdf related module into -report subpackage. -- split gstreamer related module into -gstreamer subpackage. - -* Tue Dec 18 2012 HAYASHI Kentaro - 1.2.2-2 -- split libraries and header files into devel package - -* Mon Dec 17 2012 HAYASHI Kentaro - 1.2.2-1 -- fix rpmlint issues -- follow fedora packaging guidelines - -* Mon Oct 29 2012 HAYASHI Kentaro - 1.2.2-0 -- new upstream release. - -* Wed Aug 15 2012 HAYASHI Kentaro - 1.2.1-0 -- new upstream release. - -* Sat Dec 31 2011 Kouhei Sutou - 1.2.0-0 -- new upstream release. - -* Sat Oct 22 2011 Kouhei Sutou - 1.1.9-0 -- new upstream release. - -* Sun Jul 31 2011 Kouhei Sutou - 1.1.8-0 -- new upstream release. - -* Sun Feb 13 2011 Kouhei Sutou - 1.1.7-0 -- new upstream release. - -* Wed Feb 09 2011 Kouhei Sutou - 1.1.6-0 -- new upstream release. - -* Mon Sep 06 2010 Kouhei Sutou -- (1.1.5-0) -- new upstream release - -* Thu Jun 10 2010 Kouhei Sutou -- (1.1.4-0) -- new upstream release - -* Tue Apr 13 2010 Kouhei Sutou -- (1.1.3-0) -- new upstream release - -* Sat Apr 03 2010 Kouhei Sutou -- (1.1.2-0) -- new upstream release - -* Wed Mar 3 2010 Kouhei Sutou -- (1.1.1-0) -- new upstream release - -* Tue Nov 3 2009 Kouhei Sutou -- (1.1.0-0) -- new upstream release - -* Tue Oct 20 2009 Kouhei Sutou -- (1.0.9-0) -- new upstream release - -* Sat Aug 29 2009 Kouhei Sutou -- (1.0.8-0) -- new upstream release - -* Thu May 21 2009 Kouhei Sutou -- (1.0.7-1) -- initial RPM diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..44fa79b --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +cutter fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674780 diff --git a/fix-conflicting-types-of-remove.patch b/fix-conflicting-types-of-remove.patch deleted file mode 100644 index 05f6dcf..0000000 --- a/fix-conflicting-types-of-remove.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -uNr cutter-1.2.5.orig/gcutter/gcut-glib-event-loop.c cutter-1.2.5/gcutter/gcut-glib-event-loop.c ---- cutter-1.2.5.orig/gcutter/gcut-glib-event-loop.c 2016-08-11 16:04:07.674142710 +0000 -+++ cutter-1.2.5/gcutter/gcut-glib-event-loop.c 2016-08-11 16:07:10.656090250 +0000 -@@ -90,7 +90,7 @@ - gpointer data, - GDestroyNotify notify); - --static gboolean remove (GCutEventLoop *loop, -+static gboolean remove_event (GCutEventLoop *loop, - guint tag); - - static void -@@ -113,7 +113,7 @@ - klass->parent_class.watch_child_full = watch_child_full; - klass->parent_class.add_timeout_full = add_timeout_full; - klass->parent_class.add_idle_full = add_idle_full; -- klass->parent_class.remove = remove; -+ klass->parent_class.remove = remove_event; - - spec = g_param_spec_pointer("context", - "Context", -@@ -342,7 +342,7 @@ - } - - static gboolean --remove (GCutEventLoop *loop, guint tag) -+remove_event (GCutEventLoop *loop, guint tag) - { - GCutGLibEventLoopPrivate *priv; - GSource *source; diff --git a/gcut-egg-fix-a-bug-that-source-is-removed-twice.patch b/gcut-egg-fix-a-bug-that-source-is-removed-twice.patch deleted file mode 100644 index df911f0..0000000 --- a/gcut-egg-fix-a-bug-that-source-is-removed-twice.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 82ecce029a2e7d384b23f44c9c1c14b4ebbcbede Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Thu, 15 Jan 2015 21:53:16 +0900 -Subject: [PATCH 3/4] gcut egg: fix a bug that source is removed twice - -Signed-off-by: HAYASHI Kentaro ---- - gcutter/gcut-egg.c | 41 +++++++++++++++++++++++++++++++++++++---- - 1 file changed, 37 insertions(+), 4 deletions(-) - -diff --git a/gcutter/gcut-egg.c b/gcutter/gcut-egg.c -index 83f0ed9..f4f0101 100644 ---- a/gcutter/gcut-egg.c -+++ b/gcutter/gcut-egg.c -@@ -1,6 +1,6 @@ - /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* -- * Copyright (C) 2008-2011 Kouhei Sutou -+ * Copyright (C) 2008-2015 Kouhei Sutou - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by -@@ -650,9 +650,8 @@ read_from_io_channel (GIOChannel *channel, GCutEgg *egg, guint signal) - } - - static gboolean --watch_output (GIOChannel *source, GIOCondition condition, gpointer user_data) -+watch_common (GIOChannel *source, GIOCondition condition, WatchOutputData *data) - { -- WatchOutputData *data = user_data; - gboolean keep_callback = TRUE; - - if (condition & (G_IO_IN | G_IO_PRI)) { -@@ -678,6 +677,40 @@ watch_output (GIOChannel *source, GIOCondition condition, gpointer user_data) - return keep_callback; - } - -+static gboolean -+watch_output (GIOChannel *source, GIOCondition condition, gpointer user_data) -+{ -+ WatchOutputData *data = user_data; -+ gboolean keep_callback = TRUE; -+ -+ keep_callback = watch_common(source, condition, user_data); -+ -+ if (!keep_callback) { -+ GCutEggPrivate *priv; -+ priv = GCUT_EGG_GET_PRIVATE(data->egg); -+ priv->output_watch_id = 0; -+ } -+ -+ return keep_callback; -+} -+ -+static gboolean -+watch_error (GIOChannel *source, GIOCondition condition, gpointer user_data) -+{ -+ WatchOutputData *data = user_data; -+ gboolean keep_callback = TRUE; -+ -+ keep_callback = watch_common(source, condition, user_data); -+ -+ if (!keep_callback) { -+ GCutEggPrivate *priv; -+ priv = GCUT_EGG_GET_PRIVATE(data->egg); -+ priv->error_watch_id = 0; -+ } -+ -+ return keep_callback; -+} -+ - gboolean - gcut_egg_hatch (GCutEgg *egg, GError **error) - { -@@ -747,7 +780,7 @@ gcut_egg_hatch (GCutEgg *egg, GError **error) - priv->watch_error_data->signal = signals[ERROR_RECEIVED]; - priv->error = create_input_channel(error_fd, - &(priv->error_watch_id), -- watch_output, -+ watch_error, - priv->watch_error_data); - } - --- -2.1.0 - diff --git a/gcut-egg-fix-a-bug-that-timeout-source-is-removed-twice.patch b/gcut-egg-fix-a-bug-that-timeout-source-is-removed-twice.patch deleted file mode 100644 index fd70a55..0000000 --- a/gcut-egg-fix-a-bug-that-timeout-source-is-removed-twice.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dd77d7b6471c12a3654ea3745bf3d639dba1b3ce Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Thu, 15 Jan 2015 21:55:02 +0900 -Subject: [PATCH 4/4] gcut egg: fix a bug that timeout source is removed twice - -Signed-off-by: HAYASHI Kentaro ---- - gcutter/gcut-egg.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gcutter/gcut-egg.c b/gcutter/gcut-egg.c -index f4f0101..ac5c414 100644 ---- a/gcutter/gcut-egg.c -+++ b/gcutter/gcut-egg.c -@@ -342,7 +342,8 @@ dispose (GObject *object) - &is_timeout); - while (!is_timeout && priv->process_watch_id > 0 && priv->pid > 0) - g_main_context_iteration(NULL, TRUE); -- g_source_remove(timeout_wait_id); -+ if (!is_timeout) -+ g_source_remove(timeout_wait_id); - } - } - -@@ -874,7 +875,8 @@ gcut_egg_wait (GCutEgg *egg, guint timeout, GError **error) - timeout_id = g_timeout_add(timeout, cb_timeout_wait, &is_timeout); - while (!is_timeout && priv->pid > 0) - g_main_context_iteration(NULL, TRUE); -- g_source_remove(timeout_id); -+ if (!is_timeout) -+ g_source_remove(timeout_id); - - if (is_timeout) { - gchar *command; --- -2.1.0 - diff --git a/sources b/sources deleted file mode 100644 index 2bacde1..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (cutter-1.2.6.tar.gz) = 889b3015f3fc5f43adbfbd83727788d2f128ceee8f40e731fca7609e7ddc42373e0ea4c23ec30802aa1d8737d7bac2477336d6d96ee33d354aed49d251ce02b1 diff --git a/support-g-key-file-error-quark-2.43-or-later-message.patch b/support-g-key-file-error-quark-2.43-or-later-message.patch deleted file mode 100644 index 4325a5e..0000000 --- a/support-g-key-file-error-quark-2.43-or-later-message.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/test/gcutter/test-gcut-key-file.c b/test/gcutter/test-gcut-key-file.c -index ddc1125..240369b 100644 ---- a/test/gcutter/test-gcut-key-file.c -+++ b/test/gcutter/test-gcut-key-file.c -@@ -136,7 +136,11 @@ data_get_enum (void) - 0, - g_error_new(G_KEY_FILE_ERROR, - G_KEY_FILE_ERROR_KEY_NOT_FOUND, -- "Key file does not have key 'unknown-key'")), -+ "Key file does not have key 'unknown-key'" -+#if GLIB_CHECK_VERSION(2, 43, 0) -+ " in group 'group'" -+#endif -+ )), - enum_test_data_free, - "invalid enum value", - get_enum_test_data_new( -@@ -218,7 +222,11 @@ data_get_flags (void) - 0, - g_error_new(G_KEY_FILE_ERROR, - G_KEY_FILE_ERROR_KEY_NOT_FOUND, -- "Key file does not have key 'unknown-key'")), -+ "Key file does not have key 'unknown-key'" -+#if GLIB_CHECK_VERSION(2, 43, 0) -+ " in group 'group'" -+#endif -+ )), - enum_test_data_free, - "invalid flags value", - get_flags_test_data_new( diff --git a/support-gdk-pixbuf-2.31.0-or-later.patch b/support-gdk-pixbuf-2.31.0-or-later.patch deleted file mode 100644 index 94d3055..0000000 --- a/support-gdk-pixbuf-2.31.0-or-later.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 1c1c3e696b69b695449f4fa97d9de249cc46e8e8 Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Thu, 15 Jan 2015 21:25:50 +0900 -Subject: [PATCH 1/4] test: support gdk-pixbuf 2.31.0 or later - -gdk-pixbuf 2.31.0 introduces pixel-bytes property. - -GitHub: fix #19 - -Reported by mtasaka. Thanks!!! - -Signed-off-by: HAYASHI Kentaro ---- - test/gdkcutter-pixbuf/test-gdkcut-pixbuf.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/test/gdkcutter-pixbuf/test-gdkcut-pixbuf.c b/test/gdkcutter-pixbuf/test-gdkcut-pixbuf.c -index 1b94d21..f7c9e8f 100644 ---- a/test/gdkcutter-pixbuf/test-gdkcut-pixbuf.c -+++ b/test/gdkcutter-pixbuf/test-gdkcut-pixbuf.c -@@ -1,6 +1,6 @@ - /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* -- * Copyright (C) 2009-2011 Kouhei Sutou -+ * Copyright (C) 2009-2015 Kouhei Sutou - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by -@@ -23,6 +23,11 @@ - #include - #include "../lib/cuttest-utils.h" - -+#if (GDK_PIXBUF_MAJOR > 2 || \ -+ (GDK_PIXBUF_MAJOR == 2 && GDK_PIXBUF_MINOR >= 31)) -+# define HAVE_PIXEL_BYTES -+#endif -+ - void test_equal_property(void); - void test_equal_content(void); - void test_equal_content_threshold(void); -@@ -136,6 +141,10 @@ test_inspect (void) - "height=<100>, " - "rowstride=<400>, " - "pixels=<((gpointer) %p)>" -+#ifdef HAVE_PIXEL_BYTES -+ ", " -+ "pixel-bytes=" -+#endif - ">", - pixbuf1, - gdk_pixbuf_get_pixels(pixbuf1)); -@@ -152,6 +161,10 @@ test_inspect (void) - "height=<50>, " - "rowstride=<152>, " - "pixels=<((gpointer) %p)>" -+#ifdef HAVE_PIXEL_BYTES -+ ", " -+ "pixel-bytes=" -+#endif - ">", - pixbuf2, - gdk_pixbuf_get_pixels(pixbuf2)); --- -2.1.0 - diff --git a/test-ensure-dropping-source-ID-when-callback-is-removed.patch b/test-ensure-dropping-source-ID-when-callback-is-removed.patch deleted file mode 100644 index dc35d96..0000000 --- a/test-ensure-dropping-source-ID-when-callback-is-removed.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 64367a58c06a218249026a97245716310483b090 Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Thu, 15 Jan 2015 21:44:50 +0900 -Subject: [PATCH 2/4] test: ensure dropping source ID when callback is removed - by itself - -Signed-off-by: HAYASHI Kentaro ---- - test/gcutter/test-gcut-string-io-channel.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/gcutter/test-gcut-string-io-channel.c b/test/gcutter/test-gcut-string-io-channel.c -index 769fa47..6bd2f23 100644 ---- a/test/gcutter/test-gcut-string-io-channel.c -+++ b/test/gcutter/test-gcut-string-io-channel.c -@@ -1,6 +1,6 @@ - /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* -- * Copyright (C) 2008-2011 Kouhei Sutou -+ * Copyright (C) 2008-2015 Kouhei Sutou - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by -@@ -254,6 +254,7 @@ cb_timeout_detect (gpointer user_data) - *timed_out = TRUE; - limit = gcut_string_io_channel_get_buffer_limit(channel); - gcut_string_io_channel_set_buffer_limit(channel, limit + 1); -+ timeout_id = 0; - return FALSE; - } - -@@ -361,6 +362,7 @@ cb_timeout (gpointer data) - - *emitted = TRUE; - gcut_string_io_channel_set_limit(channel, 0); -+ timeout_id = 0; - return FALSE; - } - --- -2.1.0 -