Up to 0.4.2, removing GTK interface

diff --git a/findguile.patch b/findguile.patch
deleted file mode 100644 (file)
index 5deb527..0000000
--- a/findguile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-they should really use pkgconfig on guile-2.0
-
---- weechat-0.4.0/cmake/FindGuile.cmake~       2013-01-20 10:21:06.000000000 +0200
-+++ weechat-0.4.0/cmake/FindGuile.cmake        2013-04-20 12:10:11.580621173 +0300
-@@ -31,9 +31,9 @@
-    SET(GUILE_FIND_QUIETLY TRUE)
- ENDIF(GUILE_FOUND)
- 
--FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile)
-+FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile /usr/include/guile/2.0)
- 
--FIND_LIBRARY(GUILE_LIBRARY NAMES guile PATH /usr/lib /usr/local/lib)
-+FIND_LIBRARY(GUILE_LIBRARY NAMES guile guile-2.0 PATH /usr/lib /usr/local/lib /usr/lib64)
- 
- IF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-   SET(GUILE_FOUND TRUE)

diff --git a/weechat-0.4.0-ruby-2.0-crash.patch b/weechat-0.4.0-ruby-2.0-crash.patch
deleted file mode 100644 (file)
index 5ac4e2d..0000000
--- a/weechat-0.4.0-ruby-2.0-crash.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 4fdbb83a079f24a742633fd4d02084911580c19c Mon Sep 17 00:00:00 2001
-From: Sebastien Helleu <flashcode@flashtux.org>
-Date: Fri, 22 Mar 2013 19:54:44 +0100
-Subject: [PATCH] ruby: fix crash with Ruby 2.0: use one array for the last 6
- arguments of function config_new_option (bug #31050)
-
----
- src/plugins/ruby/weechat-ruby-api.c | 38 +++++++++++++++++++------------------
- 1 file changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c
-index bbc2fbc..101caec 100644
---- a/src/plugins/ruby/weechat-ruby-api.c
-+++ b/src/plugins/ruby/weechat-ruby-api.c
-@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
-                                     VALUE description, VALUE string_values,
-                                     VALUE min, VALUE max, VALUE default_value,
-                                     VALUE value, VALUE null_value_allowed,
--                                    VALUE function_check_value,
--                                    VALUE data_check_value,
--                                    VALUE function_change,
--                                    VALUE data_change,
--                                    VALUE function_delete,
--                                    VALUE data_delete)
-+                                    VALUE callbacks)
- {
-     char *c_config_file, *c_section, *c_name, *c_type, *c_description;
-     char *c_string_values, *c_default_value, *c_value;
-     char *c_function_check_value, *c_data_check_value, *c_function_change;
-     char *c_data_change, *c_function_delete, *c_data_delete, *result;
-     int c_min, c_max, c_null_value_allowed;
--    VALUE return_value;
-+    VALUE function_check_value, data_check_value, function_change, data_change;
-+    VALUE function_delete, data_delete, return_value;
- 
-     API_FUNC(1, "config_new_option", API_RETURN_EMPTY);
-     if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type)
-         || NIL_P (description) || NIL_P (string_values) || NIL_P (min)
-         || NIL_P (max) || NIL_P (default_value) || NIL_P (value)
--        || NIL_P (null_value_allowed) || NIL_P (function_check_value)
--        || NIL_P (data_check_value) || NIL_P (function_change)
--        || NIL_P (data_change) || NIL_P (function_delete)
--        || NIL_P (data_delete))
-+        || NIL_P (null_value_allowed) || NIL_P (callbacks))
-         API_WRONG_ARGS(API_RETURN_EMPTY);
- 
-     Check_Type (config_file, T_STRING);
-@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
-     Check_Type (default_value, T_STRING);
-     Check_Type (value, T_STRING);
-     Check_Type (null_value_allowed, T_FIXNUM);
--    Check_Type (function_check_value, T_STRING);
--    Check_Type (data_check_value, T_STRING);
--    Check_Type (function_change, T_STRING);
--    Check_Type (data_change, T_STRING);
--    Check_Type (function_delete, T_STRING);
--    Check_Type (data_delete, T_STRING);
-+    Check_Type (callbacks, T_ARRAY);
-+
-+    /*
-+     * due to a Ruby limitation (15 arguments max by function), we receive the
-+     * the callbacks in an array of 6 strings (3 callbacks + 3 data)
-+     */
-+    if (RARRAY_LEN(callbacks) != 6)
-+        API_WRONG_ARGS(API_RETURN_EMPTY);
-+
-+    function_check_value = rb_ary_entry (callbacks, 0);
-+    data_check_value = rb_ary_entry (callbacks, 1);
-+    function_change = rb_ary_entry (callbacks, 2);
-+    data_change = rb_ary_entry (callbacks, 3);
-+    function_delete = rb_ary_entry (callbacks, 4);
-+    data_delete = rb_ary_entry (callbacks, 5);
- 
-     c_config_file = StringValuePtr (config_file);
-     c_section = StringValuePtr (section);
-@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
-     API_DEF_FUNC(config_new, 3);
-     API_DEF_FUNC(config_new_section, 14);
-     API_DEF_FUNC(config_search_section, 2);
--    API_DEF_FUNC(config_new_option, 17);
-+    API_DEF_FUNC(config_new_option, 12);
-     API_DEF_FUNC(config_search_option, 3);
-     API_DEF_FUNC(config_string_to_boolean, 1);
-     API_DEF_FUNC(config_option_reset, 2);
--- 
-1.8.1.4
-

diff --git a/weechat-ac.patch b/weechat-ac.patch
deleted file mode 100644 (file)
index a38cc86..0000000
--- a/weechat-ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- weechat-0.3.1/configure.in 2010-01-23 09:06:36.000000000 +0100
-+++ weechat-0.3.1-dud/configure.in     2010-02-18 10:57:44.595581320 +0100
-@@ -889,16 +889,6 @@ else
-     AC_MSG_RESULT(no)
- fi
- 
--CFLAGS=`echo $CFLAGS | sed 's/ -g / /g'`
--CFLAGS=`echo $CFLAGS | sed 's/^-g //g'`
--CFLAGS=`echo $CFLAGS | sed 's/ -g$//g'`
--CFLAGS=`echo $CFLAGS | sed 's/^-g$//g'`
--if test "x$debug" = "x0" ; then
--    CFLAGS="$COMMON_CFLAGS $CFLAGS"
--else
--    CFLAGS="$COMMON_CFLAGS $CFLAGS -g -O0"
--fi
--
- LIBS="$LIBS $INTLLIBS"
- 
- case "$host_os" in

diff --git a/weechat-curses.patch b/weechat-curses.patch
deleted file mode 100644 (file)
index 03de59b..0000000
--- a/weechat-curses.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig  2011-10-22 09:15:47.000000000 +0200
-+++ configure.in       2011-10-23 19:22:22.834371143 +0200
-@@ -872,7 +872,7 @@
- enable_eatnewlineglitch="no"
- AC_CACHE_CHECK([for eat_newline_glitch support], ac_have_eatnewlineglitch, [
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
--[[ #include <term.h> ]],
-+[[ #include <ncursesw/term.h> ]],
- [[ eat_newline_glitch = 0; ]])],
- [ ac_have_eatnewlineglitch="yes" ],
- [ ac_have_eatnewlineglitch="no" ])])

diff --git a/weechat.spec b/weechat.spec
index ac1f6789d32ff0b618aefcee377a02b30eb9d7c3..dcf238a8578e12d7bfb9db60342d086d3ed37d61 100644 (file)
--- a/weechat.spec
+++ b/weechat.spec
@@ -4,7 +4,6 @@
 # Conditional build:
 # Features
 %bcond_without aspell  # don't build aspell support
-%bcond_without gtk     # build gtk support
 %bcond_without gnutls  # don't build gnutls support
 %bcond_without doc     # don't build docs
 # Bindings
@@ -18,17 +17,13 @@
 Summary:       WeeChat - fast and light chat environment
 Summary(pl.UTF-8):     WeeChat - szybkie i lekkie środowisko do rozmów
 Name:          weechat
-Version:       0.4.0
-Release:       4
+Version:       0.4.2
+Release:       1
 License:       GPL v3+
 Group:         Applications/Communications
 Source0:       http://www.weechat.org/files/src/%{name}-%{version}.tar.gz
-# Source0-md5: 6d3c0f338d4ec3fb3386becd1efa6ae1
-Patch0:                %{name}-ac.patch
+# Source0-md5: fd584c258aace2aa898f40e1fcf06084
 Patch1:                %{name}-plugins_header.patch
-Patch2:                %{name}-curses.patch
-Patch3:                findguile.patch
-Patch4:                weechat-0.4.0-ruby-2.0-crash.patch
 Patch5:                weechat-0.4.0-ruby-version.patch
 URL:           http://www.weechat.org/
 %{?with_aspell:BuildRequires:  aspell-devel}
@@ -36,7 +31,6 @@ BuildRequires:        cmake
 BuildRequires: curl-devel
 BuildRequires: gettext-devel
 %{?with_gnutls:BuildRequires:  gnutls-devel}
-%{?with_gtk:BuildRequires:     gtk+2-devel}
 %{?with_guile:BuildRequires:   guile-devel}
 BuildRequires: libatomic_ops
 BuildRequires: libgcrypt-devel
@@ -68,14 +62,6 @@ WeeChat (Wee Ehanced Environment for Chat) to szybkie i lekkie
 zrobić przy pomocy klawiatury. Jest konfigurowalne i rozszerzalne za
 pomocą skryptów.
 
-%package gtk
-Summary:       GTK WeeChat UI
-Group:         Applications/Communications
-Requires:      %{name}-common = %{version}-%{release}
-
-%description gtk
-GTK WeeChat UI.
-
 %package common
 Summary:       WeeChat common files
 Group:         Applications/Communications
@@ -92,19 +78,11 @@ HTML documentation for weechat.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
 %patch5 -p1
 
-%{__sed} -i -e 's#PYTHON_LIB=.*#PYTHON_LIB=%{_libdir}#g' configure.in
-%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
-
-%if %{without gtk}
-echo 'AC_DEFUN([AM_PATH_GTK_2_0],[])' >> acinclude.m4
-%endif
+%{__sed} -i -e 's#PYTHON_LIB=.*#PYTHON_LIB=%{_libdir}#g' configure.ac
+%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 
 %build
 install -d build
@@ -114,7 +92,6 @@ cd build
        -DLIBDIR=%{_libdir} \
        -DENABLE_NCURSES=ON \
        -DENABLE_ASPELL=%{?with_aspell:ON}%{!?with_aspell:OFF} \
-       -DENABLE_GTK=%{?with_gtk:ON}%{!?with_gtk:OFF} \
        -DENABLE_GNUTLS=%{?with_gnutls:ON}%{!?with_gnutls:OFF} \
        -DENABLE_DOC=%{?with_doc:ON}%{!?with_doc:OFF} \
        -DENABLE_PERL=%{?with_perl:ON}%{!?with_perl:OFF} \
@@ -123,6 +100,8 @@ cd build
        -DENABLE_LUA=%{?with_lua:ON}%{!?with_lua:OFF} \
        -DENABLE_GUILE=%{?with_guile:ON}%{!?with_guile:OFF} \
        -DENABLE_TCL=%{?with_tcl:ON}%{!?with_tcl:OFF} \
+    -DENABLE_MAN=ON \
+    -DENABLE_DOC=ON \
        ..
 
 %{__make} VERBOSE=1
@@ -143,14 +122,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/weechat-curses
-%{_mandir}/man1/weechat-curses.1*
-
-%if %{with gtk}
-%files gtk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/weechat-gtk
-%endif
+%attr(755,root,root) %{_bindir}/weechat
+%{_mandir}/man1/weechat.1*
 
 %files common -f %{name}.lang
 %defattr(644,root,root,755)