diff options
author | Leo <thinkabit.ukim@gmail.com> | 2020-01-28 23:27:25 +0100 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-28 23:27:25 +0100 |
commit | 238b6bccbab3b844079fa109d5cee096b81756d3 (patch) | |
tree | 136316a172b542efbaa096fa0bf9ed5e28690b44 | |
parent | 4b37d4e75716b602a0c0591f105ed1d7fe36d570 (diff) |
Remove stale patches
Those are patches that are no longer applied by their packages
-rw-r--r-- | main/bacula/configure-detect-gcc.patch | 81 | ||||
-rw-r--r-- | main/bacula/fix-headers.patch | 10 | ||||
-rw-r--r-- | main/clamav/arm.patch | 15 | ||||
-rw-r--r-- | main/gmp/gmp-4.1.4-noexecstack.patch | 20 | ||||
-rw-r--r-- | main/libpcap/disable-remote.patch | 30 | ||||
-rw-r--r-- | main/nmap/nmap-4.53-uclibc++-output.cc.patch | 11 | ||||
-rw-r--r-- | main/spice/CVE-2018-10873.patch | 67 | ||||
-rw-r--r-- | main/spice/CVE-2019-3813.patch | 102 | ||||
-rw-r--r-- | main/spice/disable-test-channel.patch | 87 | ||||
-rw-r--r-- | main/usb-modeswitch/Makefile.patch | 16 | ||||
-rw-r--r-- | main/vte3/fix-empty-options-struct.patch | 11 |
11 files changed, 0 insertions, 450 deletions
diff --git a/main/bacula/configure-detect-gcc.patch b/main/bacula/configure-detect-gcc.patch deleted file mode 100644 index 2d0c647da76..00000000000 --- a/main/bacula/configure-detect-gcc.patch +++ /dev/null @@ -1,81 +0,0 @@ -This fixes building with ccache -http://bugs.bacula.org/view.php?id=2118 - -diff --git a/autoconf/configure.in b/autoconf/configure.in -index 47d45de..2a6a194 100644 ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -87,17 +87,6 @@ AC_PROG_CXX - AC_PROG_CC_C_O dnl Determine if C compiler support -c -o. - AC_PROG_GCC_TRADITIONAL dnl Determine if ioctl() need -traditional. - --BASECC=`basename $CC` --have_gcc=no --if test "x$BASECC" = xgcc; then -- AC_DEFINE(HAVE_GCC) -- have_gcc=yes --fi --AC_PATH_PROG(CXX, $CXX, $CXX) --if test ! -e $CXX; then -- AC_MSG_ERROR(Unable to find C++ compiler) --fi -- - dnl ------------------------------------------------------- - dnl Check for programs. - dnl ------------------------------------------------------ -@@ -2854,10 +2843,18 @@ AC_DEFINE(FDLIBS) - - CFLAGS=${CFLAGS--O} - --if test x$have_gcc = xyes ; then -+dnl -+dnl Check if gcc -+dnl -+AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ -+ #if !defined (__GNUC__) -+ #error "not gcc" -+ #endif -+ ]])], [ - CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" - CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" --fi -+]) -+ - LDFLAGS=${LDFLAGS--O} - CPPFLAGS="$CPPFLAGS" - CFLAGS="$CFLAGS" -diff --git a/src/findlib/file_attrs.c b/src/findlib/file_attrs.c -index 9268ce1..42036bb 100644 ---- a/src/findlib/file_attrs.c -+++ b/src/findlib/file_attrs.c -@@ -368,7 +368,7 @@ void encode_stat(char *buf, struct stat *statp, int stat_size, int32_t LinkFI, i - #ifdef HAVE_TYPEOF - #define plug(st, val) st = (typeof st)val - #else -- #if !HAVE_GCC & HAVE_SUN_OS -+ #if !defined(__GNUC__) & HAVE_SUN_OS - /* Sun compiler does not handle templates correctly */ - #define plug(st, val) st = val - #elif __sgi -diff --git a/src/lib/bsys.c b/src/lib/bsys.c -index 40e048e..f352db0 100644 ---- a/src/lib/bsys.c -+++ b/src/lib/bsys.c -@@ -859,7 +859,7 @@ void allow_os_suspensions() - #endif - - --#if HAVE_BACKTRACE && HAVE_GCC -+#if HAVE_BACKTRACE && defined(__GNUC__) - #include <cxxabi.h> - #include <execinfo.h> - void stack_trace() -@@ -910,6 +910,6 @@ void stack_trace() - } - actuallyfree(stack_strings); /* malloc()ed by backtrace_symbols */ - } --#else /* HAVE_BACKTRACE && HAVE_GCC */ -+#else /* HAVE_BACKTRACE && defined(__GNUC__) */ - void stack_trace() {} --#endif /* HAVE_BACKTRACE && HAVE_GCC */ -+#endif /* HAVE_BACKTRACE && defined(__GNUC__) */ diff --git a/main/bacula/fix-headers.patch b/main/bacula/fix-headers.patch deleted file mode 100644 index 49cacc350a0..00000000000 --- a/main/bacula/fix-headers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bacula-5.2.13.orig/src/lib/mntent_cache.c -+++ bacula-5.2.13/src/lib/mntent_cache.c -@@ -62,6 +62,7 @@ - #include "mntent_cache.h" - - #include <errno.h> -+#include <paths.h> - #include <stdlib.h> - #include <string.h> - #include <sys/types.h> diff --git a/main/clamav/arm.patch b/main/clamav/arm.patch deleted file mode 100644 index d503679b7cb..00000000000 --- a/main/clamav/arm.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://raw.github.com/archlinuxarm/PKGBUILDs/master/extra/clamav/arm.patch - -diff -urN a/clamd/fan-syscalllib.h b/clamd/fan-syscalllib.h ---- a/clamd/fan-syscalllib.h 2013-09-16 13:28:14.000000000 -0600 -+++ b/clamd/fan-syscalllib.h 2013-09-19 21:29:47.314868930 -0600 -@@ -10,6 +10,9 @@ - #elif defined(__i386__) - # define __NR_fanotify_init 338 - # define __NR_fanotify_mark 339 -+#elif defined(__ARM_EABI__) -+# define __NR_fanotify_init 367 -+# define __NR_fanotify_mark 368 - #else - # error "System call numbers not defined for this architecture" - #endif diff --git a/main/gmp/gmp-4.1.4-noexecstack.patch b/main/gmp/gmp-4.1.4-noexecstack.patch deleted file mode 100644 index 093bec1a5dc..00000000000 --- a/main/gmp/gmp-4.1.4-noexecstack.patch +++ /dev/null @@ -1,20 +0,0 @@ -fixed executable stack - -http://bugs.gentoo.org/115038 - ---- gmp-4.1.4/configure -+++ gmp-4.1.4/configure -@@ -21689,6 +21689,13 @@ - fi - echo "')" >> $gmp_configm4 - echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4 -+# Gentoo hack -+case $host_os in -+ *linux*) -+ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4 -+ echo '.previous' >> $gmp_configm4 -+ ;; -+esac - - # Create Makefiles - # FIXME: Upcoming version of autoconf/automake may not like broken lines. diff --git a/main/libpcap/disable-remote.patch b/main/libpcap/disable-remote.patch deleted file mode 100644 index 91a94e9a51a..00000000000 --- a/main/libpcap/disable-remote.patch +++ /dev/null @@ -1,30 +0,0 @@ -Disable bits of remote capture support inherited from the WinPCAP merge -which cause applications to fail to build if they define HAVE_REMOTE (#843384). - -Patch-Source: https://sources.debian.net/src/libpcap/1.8.1-3/debian/patches/disable-remote.diff/ ---- a/pcap/pcap.h -+++ b/pcap/pcap.h -@@ -506,6 +506,11 @@ - #define MODE_STAT 1 - #define MODE_MON 2 - -+#ifdef HAVE_REMOTE -+ /* Includes most of the public stuff that is needed for the remote capture */ -+ #include <remote-ext.h> -+#endif /* HAVE_REMOTE */ -+ - #elif defined(MSDOS) - - /* -@@ -526,11 +531,6 @@ - - #endif /* _WIN32/MSDOS/UN*X */ - --#ifdef HAVE_REMOTE -- /* Includes most of the public stuff that is needed for the remote capture */ -- #include <remote-ext.h> --#endif /* HAVE_REMOTE */ -- - #ifdef __cplusplus - } - #endif diff --git a/main/nmap/nmap-4.53-uclibc++-output.cc.patch b/main/nmap/nmap-4.53-uclibc++-output.cc.patch deleted file mode 100644 index 3253fc26b31..00000000000 --- a/main/nmap/nmap-4.53-uclibc++-output.cc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nmap/output.cc.orig 2007-12-15 09:54:07.000000000 -0800 -+++ nmap/output.cc 2007-12-15 09:54:19.000000000 -0800 -@@ -1904,7 +1904,7 @@ - - /* Compares this record to another. First compare the directory names, then - compare the file names. */ -- bool operator<(const struct data_file_record& other) { -+ bool operator<(const struct data_file_record& other) const { - int cmp; - - cmp = dir.compare(other.dir); diff --git a/main/spice/CVE-2018-10873.patch b/main/spice/CVE-2018-10873.patch deleted file mode 100644 index de83029cf32..00000000000 --- a/main/spice/CVE-2018-10873.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://gitlab.freedesktop.org/spice/spice-common/commit/bb15d4815ab586b4c4a20f4a565970a44824c42c - -diff --git a/spice-common/python_modules/demarshal.py b/python_modules/demarshal.py -index 7b53361..5a237a6 100644 ---- a/spice-common/python_modules/demarshal.py -+++ b/spice-common/python_modules/demarshal.py -@@ -331,6 +331,7 @@ def write_validate_array_item(writer, container, item, scope, parent_scope, star - writer.assign(nelements, array.size) - elif array.is_remaining_length(): - if element_type.is_fixed_nw_size(): -+ writer.error_check("%s > message_end" % item.get_position()) - if element_type.get_fixed_nw_size() == 1: - writer.assign(nelements, "message_end - %s" % item.get_position()) - else: -diff --git a/tests/test-marshallers.c b/tests/test-marshallers.c -index ad45e36..02fbcd1 100644 ---- a/spice-common/tests/test-marshallers.c -+++ b/spice-common/tests/test-marshallers.c -@@ -150,6 +150,14 @@ int main(int argc G_GNUC_UNUSED, char **argv G_GNUC_UNUSED) - - test_overflow(marshaller); - -+ len = 4; -+ data = g_new0(uint8_t, len); -+ memset(data, 0, len); -+ msg = (SpiceMsgMainShortDataSubMarshall *) spice_parse_msg(data, data + len, 1, 3, 0, -+ &msg_len, &free_message); -+ g_assert_null(msg); -+ g_free(data); -+ - spice_marshaller_destroy(marshaller); - - return 0; -diff --git a/tests/test-marshallers.h b/tests/test-marshallers.h -index 99877c0..4eab90f 100644 ---- a/spice-common/tests/test-marshallers.h -+++ b/spice-common/tests/test-marshallers.h -@@ -21,5 +21,10 @@ typedef struct SpiceMsgChannels { - uint16_t channels[0]; - } SpiceMsgChannels; - -+typedef struct { -+ uint32_t dummy[2]; -+ uint8_t data[0]; -+} SpiceMsgMainLenMessage; -+ - #endif /* _H_TEST_MARSHALLERS */ - -diff --git a/tests/test-marshallers.proto b/tests/test-marshallers.proto -index c75134e..34cc892 100644 ---- a/spice-common/tests/test-marshallers.proto -+++ b/spice-common/tests/test-marshallers.proto -@@ -19,6 +19,11 @@ channel TestChannel { - uint32 num_of_channels; - uint16 channels[num_of_channels] @end; - } @ctype(SpiceMsgChannels) channels_list; -+ -+ message { -+ uint32 dummy[2]; -+ uint8 data[] @end; -+ } LenMessage; - }; - - protocol Spice { --- -2.17.1 - diff --git a/main/spice/CVE-2019-3813.patch b/main/spice/CVE-2019-3813.patch deleted file mode 100644 index 1f80c1eb602..00000000000 --- a/main/spice/CVE-2019-3813.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 6eff47e72cb2f23d168be58bab8bdd60df49afd0 Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau <cfergeau@redhat.com> -Date: Thu, 29 Nov 2018 14:18:39 +0100 -Subject: [spice-server] memslot: Fix off-by-one error in group/slot boundary - check - -RedMemSlotInfo keeps an array of groups, and each group contains an -array of slots. Unfortunately, these checks are off by 1, they check -that the index is greater or equal to the number of elements in the -array, while these arrays are 0 based. The check should only check for -strictly greater than the number of elements. - -For the group array, this is not a big issue, as these memslot groups -are created by spice-server users (eg QEMU), and the group ids used to -index that array are also generated by the spice-server user, so it -should not be possible for the guest to set them to arbitrary values. - -The slot id is more problematic, as it's calculated from a QXLPHYSICAL -address, and such addresses are usually set by the guest QXL driver, so -the guest can set these to arbitrary values, including malicious values, -which are probably easy to build from the guest PCI configuration. - -This patch fixes the arrays bound check, and adds a test case for this. - -Signed-off-by: Christophe Fergeau <cfergeau@redhat.com> ---- - server/memslot.c | 4 ++-- - server/tests/test-qxl-parsing.c | 30 ++++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/server/memslot.c b/server/memslot.c -index ede77e7..ea6f981 100644 ---- a/server/memslot.c -+++ b/server/memslot.c -@@ -97,13 +97,13 @@ void *memslot_get_virt(RedMemSlotInfo *info, QXLPHYSICAL addr, uint32_t add_size - - MemSlot *slot; - -- if (group_id > info->num_memslots_groups) { -+ if (group_id >= info->num_memslots_groups) { - spice_critical("group_id too big"); - return NULL; - } - - slot_id = memslot_get_id(info, addr); -- if (slot_id > info->num_memslots) { -+ if (slot_id >= info->num_memslots) { - print_memslots(info); - spice_critical("slot_id %d too big, addr=%" PRIx64, slot_id, addr); - return NULL; -diff --git a/server/tests/test-qxl-parsing.c b/server/tests/test-qxl-parsing.c -index 8565239f0..447425984 100644 ---- a/server/tests/test-qxl-parsing.c -+++ b/server/tests/test-qxl-parsing.c -@@ -98,6 +98,31 @@ static void deinit_qxl_surface(QXLSurfaceCmd *qxl) - g_free(from_physical(qxl->u.surface_create.data)); - } - -+static void test_memslot_invalid_group_id(void) -+{ -+ RedMemSlotInfo mem_info; -+ init_meminfo(&mem_info); -+ -+ memslot_get_virt(&mem_info, 0, 16, 1); -+} -+ -+static void test_memslot_invalid_slot_id(void) -+{ -+ RedMemSlotInfo mem_info; -+ init_meminfo(&mem_info); -+ -+ memslot_get_virt(&mem_info, 1 << mem_info.memslot_id_shift, 16, 0); -+} -+ -+static void test_memslot_invalid_addresses(void) -+{ -+ g_test_trap_subprocess("/server/memslot-invalid-addresses/subprocess/group_id", 0, 0); -+ g_test_trap_assert_stderr("*group_id too big*"); -+ -+ g_test_trap_subprocess("/server/memslot-invalid-addresses/subprocess/slot_id", 0, 0); -+ g_test_trap_assert_stderr("*slot_id 1 too big*"); -+} -+ - static void test_no_issues(void) - { - RedMemSlotInfo mem_info; -@@ -317,6 +342,11 @@ int main(int argc, char *argv[]) - { - g_test_init(&argc, &argv, NULL); - -+ /* try to use invalid memslot group/slot */ -+ g_test_add_func("/server/memslot-invalid-addresses", test_memslot_invalid_addresses); -+ g_test_add_func("/server/memslot-invalid-addresses/subprocess/group_id", test_memslot_invalid_group_id); -+ g_test_add_func("/server/memslot-invalid-addresses/subprocess/slot_id", test_memslot_invalid_slot_id); -+ - /* try to create a surface with no issues, should succeed */ - g_test_add_func("/server/qxl-parsing-no-issues", test_no_issues); - --- -2.19.2 - - diff --git a/main/spice/disable-test-channel.patch b/main/spice/disable-test-channel.patch deleted file mode 100644 index 6fce9e4b7c6..00000000000 --- a/main/spice/disable-test-channel.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/server/tests/Makefile.am -+++ b/server/tests/Makefile.am -@@ -57,7 +57,6 @@ - test-vdagent \ - test-fail-on-null-core-interface \ - test-empty-success \ -- test-channel \ - $(NULL) - - noinst_PROGRAMS = \ ---- a/server/tests/Makefile.in -+++ b/server/tests/Makefile.in -@@ -95,7 +95,7 @@ - test-qxl-parsing$(EXEEXT) test-stat-file$(EXEEXT) \ - test-leaks$(EXEEXT) test-vdagent$(EXEEXT) \ - test-fail-on-null-core-interface$(EXEEXT) \ -- test-empty-success$(EXEEXT) test-channel$(EXEEXT) \ -+ test-empty-success$(EXEEXT) \ - $(am__EXEEXT_1) - noinst_PROGRAMS = test-display-no-ssl$(EXEEXT) \ - test-display-streaming$(EXEEXT) \ -@@ -181,14 +181,6 @@ - $(top_builddir)/server/libserver.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --test_channel_SOURCES = test-channel.c --test_channel_OBJECTS = test-channel.$(OBJEXT) --test_channel_LDADD = $(LDADD) --test_channel_DEPENDENCIES = libtest.a \ -- $(top_builddir)/spice-common/common/libspice-common.la \ -- $(top_builddir)/server/libserver.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - test_codecs_parsing_SOURCES = test-codecs-parsing.c - test_codecs_parsing_OBJECTS = test-codecs-parsing.$(OBJEXT) - test_codecs_parsing_LDADD = $(LDADD) -@@ -383,7 +375,7 @@ - SOURCES = $(libtest_stat1_a_SOURCES) $(libtest_stat2_a_SOURCES) \ - $(libtest_stat3_a_SOURCES) $(libtest_stat4_a_SOURCES) \ - $(libtest_a_SOURCES) $(spice_server_replay_SOURCES) \ -- test-agent-msg-filter.c test-channel.c test-codecs-parsing.c \ -+ test-agent-msg-filter.c test-codecs-parsing.c \ - test-display-no-ssl.c test-display-resolution-changes.c \ - test-display-streaming.c test-display-width-stride.c \ - test-empty-success.c test-fail-on-null-core-interface.c \ -@@ -394,7 +386,7 @@ - DIST_SOURCES = $(libtest_stat1_a_SOURCES) $(libtest_stat2_a_SOURCES) \ - $(libtest_stat3_a_SOURCES) $(libtest_stat4_a_SOURCES) \ - $(libtest_a_SOURCES) $(spice_server_replay_SOURCES) \ -- test-agent-msg-filter.c test-channel.c test-codecs-parsing.c \ -+ test-agent-msg-filter.c test-codecs-parsing.c \ - test-display-no-ssl.c test-display-resolution-changes.c \ - test-display-streaming.c test-display-width-stride.c \ - test-empty-success.c test-fail-on-null-core-interface.c \ -@@ -982,10 +974,6 @@ - @rm -f test-agent-msg-filter$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_agent_msg_filter_OBJECTS) $(test_agent_msg_filter_LDADD) $(LIBS) - --test-channel$(EXEEXT): $(test_channel_OBJECTS) $(test_channel_DEPENDENCIES) $(EXTRA_test_channel_DEPENDENCIES) -- @rm -f test-channel$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(test_channel_OBJECTS) $(test_channel_LDADD) $(LIBS) -- - test-codecs-parsing$(EXEEXT): $(test_codecs_parsing_OBJECTS) $(test_codecs_parsing_DEPENDENCIES) $(EXTRA_test_codecs_parsing_DEPENDENCIES) - @rm -f test-codecs-parsing$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_codecs_parsing_OBJECTS) $(test_codecs_parsing_LDADD) $(LIBS) -@@ -1077,7 +1065,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_stat4_a-stat-test.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replay.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-agent-msg-filter.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-channel.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-codecs-parsing.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-display-base.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-display-no-ssl.Po@am__quote@ -@@ -1473,13 +1460,6 @@ - test-empty-success.log: test-empty-success$(EXEEXT) - @p='test-empty-success$(EXEEXT)'; \ - b='test-empty-success'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --test-channel.log: test-channel$(EXEEXT) -- @p='test-channel$(EXEEXT)'; \ -- b='test-channel'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ diff --git a/main/usb-modeswitch/Makefile.patch b/main/usb-modeswitch/Makefile.patch deleted file mode 100644 index d7f526aa1ea..00000000000 --- a/main/usb-modeswitch/Makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -21,11 +21,11 @@ - install -D -m644 40-usb_modeswitch.rules $(RULESDIR)/40-usb_modeswitch.rules - - db-install: -- install -m644 -t $(PREFIX)/share/usb_modeswitch ./usb_modeswitch.d/* -+ cp ./usb_modeswitch.d/* $(PREFIX)/share/usb_modeswitch - - db-install-packed: - cd ./usb_modeswitch.d; tar -czf ../configPack.tar.gz * -- install -m644 -t $(PREFIX)/share/usb_modeswitch ./configPack.tar.gz -+ install -m644 $(PREFIX)/share/usb_modeswitch ./configPack.tar.gz - rm -f ./configPack.tar.gz - - diff --git a/main/vte3/fix-empty-options-struct.patch b/main/vte3/fix-empty-options-struct.patch deleted file mode 100644 index 7e692ae0a67..00000000000 --- a/main/vte3/fix-empty-options-struct.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -819,6 +819,8 @@ - - public struct Options - { -+ //FIXME Merge this struct into App class -+ public int dummy; - public static bool audible = false; - public static string? command = null; - private static string? cjk_ambiguous_width_string = null; |