--- xf86-input-wacom-0.14.0.orig/debian/patches/101_fix_build_against_frankenserver.patch
+++ xf86-input-wacom-0.14.0/debian/patches/101_fix_build_against_frankenserver.patch
@@ -0,0 +1,81 @@
+Index: xf86-input-wacom/test/fake-symbols.h
+================================================= ==================
+--- xf86-input-wacom.orig/test/fake-symbols.h 2012-02-01 12:24:38.555675784 +0200
++++ xf86-input-wacom/test/fake-symbols.h 2012-02-01 12:26:46.943528107 +0200
+@@ -1,13 +1,8 @@
+ #include <xorg-server.h>
+ #include <xf86Xinput.h>
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
+-#define OPTTYPE XF86OptionPtr
+-#define CONST const
+-#else
+ #define OPTTYPE pointer
+ #define CONST
+-#endif
+
+ extern int xf86ReadSerial (int fd, void *buf, int count);
+ extern int xf86WriteSerial (int fd, const void *buf, int count);
+Index: xf86-input-wacom/src/wcmValidateDevice.c
+================================================= ==================
+--- xf86-input-wacom.orig/src/wcmValidateDevice.c 2012-02-01 12:24:38.567676143 +0200
++++ xf86-input-wacom/src/wcmValidateDevice.c 2012-02-01 12:26:46.943528107 +0200
+@@ -312,7 +312,6 @@
+ return ret;
+ }
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
+ static InputOption*
+ input_option_new(InputOption *list, char *key, char *value)
+ {
+@@ -338,7 +337,6 @@
+ *opts = tmp;
+ }
+ }
+-#endif
+
+ /**
+ * Duplicate xf86 options, replace the "type" option with the given type
+Index: xf86-input-wacom/test/fake-symbols.c
+================================================= ==================
+--- xf86-input-wacom.orig/test/fake-symbols.c 2012-02-01 12:26:41.939377956 +0200
++++ xf86-input-wacom/test/fake-symbols.c 2012-02-01 12:27:11.964278863 +0200
+@@ -461,38 +461,3 @@
+ xf86UnblockSIGIO (int wasset)
+ {
+ }
+-
+-/* This is not the same as the X server one, but it'll do for the tests */
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
+-typedef struct _InputOption {
+- struct _InputOption *next;
+- char *key;
+- char *value;
+-} InputOption;
+-
+-InputOption*
+-input_option_new(InputOption *list, const char *key, const char *value)
+-{
+- InputOption *new;
+-
+- new = calloc(1, sizeof(InputOption));
+- new->key = strdup(key);
+- new->value = strdup(value);
+- new->next = list;
+- return new;
+-}
+-
+-void
+-input_option_free_list(InputOption **opts)
+-{
+- InputOption *tmp = *opts;
+- while(*opts)
+- {
+- tmp = (*opts)->next;
+- free((*opts)->key);
+- free((*opts)->value);
+- free((*opts));
+- *opts = tmp;
+- }
+-}
+-#endif
Bookmarks