commit 2b5dd53d2d774d2e270d0096c70b0ae050fb65af Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Nov 30 00:34:52 2014 +1100 libsexy: fix-null-list and pkgconfig-pollution fix diff --git a/libsexy/.md5sum b/libsexy/.md5sum index 2f2d292..2713e0a 100644 --- a/libsexy/.md5sum +++ b/libsexy/.md5sum @@ -1 +1,3 @@ +52f2ca41f833cc1258f893c237922b18 libsexy-0.1.11-fix-null-list.patch +7f641d872f76d42c069b2eee932981f6 libsexy-0.1.11-pkgconfig-pollution.patch 33c079a253270ec8bfb9508e4bb30754 libsexy-0.1.11.tar.gz diff --git a/libsexy/Pkgfile b/libsexy/Pkgfile index b3e895e..e2eced5 100644 --- a/libsexy/Pkgfile +++ b/libsexy/Pkgfile @@ -6,12 +6,17 @@ name=libsexy version=0.1.11 -release=1 -source=(http://releases.chipx86.com/libsexy/libsexy/libsexy-$version.tar.gz) +release=2 +source=(http://releases.chipx86.com/libsexy/libsexy/libsexy-$version.tar.gz + libsexy-0.1.11-fix-null-list.patch + libsexy-0.1.11-pkgconfig-pollution.patch) build() { cd $name-$version + patch -p1 -i $SRC/libsexy-0.1.11-fix-null-list.patch + patch -p0 -i $SRC/libsexy-0.1.11-pkgconfig-pollution.patch + sed -i -e "/^SUBDIRS = /s/docs //" Makefile.in ./configure --prefix=/usr diff --git a/libsexy/libsexy-0.1.11-fix-null-list.patch b/libsexy/libsexy-0.1.11-fix-null-list.patch new file mode 100644 index 0000000..5330e12 --- /dev/null +++ b/libsexy/libsexy-0.1.11-fix-null-list.patch @@ -0,0 +1,34 @@ +diff -Nur libsexy-0.1.11/libsexy/sexy-spell-entry.c libsexy-0.1.11_patched/libsexy/sexy-spell-entry.c +--- libsexy-0.1.11/libsexy/sexy-spell-entry.c 2006-08-17 21:11:09.000000000 +0300 ++++ libsexy-0.1.11_patched/libsexy/sexy-spell-entry.c 2009-05-17 15:15:25.000000000 +0300 +@@ -56,7 +56,7 @@ + static void (*enchant_dict_add_to_session) (struct EnchantDict * dict, const char *const word, ssize_t len); + static int (*enchant_dict_check) (struct EnchantDict * dict, const char *const word, ssize_t len); + static void (*enchant_dict_describe) (struct EnchantDict * dict, EnchantDictDescribeFn fn, void * user_data); +-static void (*enchant_dict_free_suggestions) (struct EnchantDict * dict, char **suggestions); ++static void (*enchant_dict_free_string_list) (struct EnchantDict * dict, char **suggestions); + static void (*enchant_dict_store_replacement) (struct EnchantDict * dict, const char *const mis, ssize_t mis_len, const char *const cor, ssize_t cor_len); + static char ** (*enchant_dict_suggest) (struct EnchantDict * dict, const char *const word, ssize_t len, size_t * out_n_suggs); + static gboolean have_enchant = FALSE; +@@ -156,8 +156,8 @@ + MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session) + MODULE_SYMBOL("enchant_dict_check", enchant_dict_check) + MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe) +- MODULE_SYMBOL("enchant_dict_free_suggestions", +- enchant_dict_free_suggestions) ++ MODULE_SYMBOL("enchant_dict_free_string_list", ++ enchant_dict_free_string_list) + MODULE_SYMBOL("enchant_dict_store_replacement", + enchant_dict_store_replacement) + MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest) +@@ -435,9 +435,8 @@ + gtk_widget_show(mi); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); + } ++ enchant_dict_free_string_list(dict, suggestions); + } +- +- enchant_dict_free_suggestions(dict, suggestions); + } + + static GtkWidget * diff --git a/libsexy/libsexy-0.1.11-pkgconfig-pollution.patch b/libsexy/libsexy-0.1.11-pkgconfig-pollution.patch new file mode 100644 index 0000000..faf16de --- /dev/null +++ b/libsexy/libsexy-0.1.11-pkgconfig-pollution.patch @@ -0,0 +1,12 @@ +--- libsexy.pc.in ++++ libsexy.pc.in +@@ -6,7 +6,8 @@ + Name: libsexy + Description: Doing naughty things to good widgets + Version: @VERSION@ +-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@ ++Libs: -L${libdir} -lsexy ++Libs.private: @PACKAGE_LIBS@ + Cflags: -I${includedir} @PACKAGE_CFLAGS@ + +