[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-experimental'



 debian/changelog                             |    2 ++
 debian/patches/02_hide_panoramix_symbol.diff |   13 +++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 16 insertions(+)

New commits:
commit 21e5991de4970790b30dd7a5886d68da6d7eca54
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Wed Jan 9 17:32:58 2013 +0100

    Add patch to fix build failure of xserver-xorg-core-udeb.
    
    02_hide_panoramix_symbol.diff

diff --git a/debian/changelog b/debian/changelog
index 3d36524..510c85d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
     - 04_int10-fix-pci_device_read_rom-usage.diff
     - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
   * Bump x11proto-input-dev and libpixman-1-dev minimum versions.
+  * Add patch to fix build failure of xserver-xorg-core-udeb.
+    - 02_hide_panoramix_symbol.diff
 
  -- Robert Hooker <sarvatt@ubuntu.com>  Wed, 22 Aug 2012 11:12:17 -0400
 
diff --git a/debian/patches/02_hide_panoramix_symbol.diff b/debian/patches/02_hide_panoramix_symbol.diff
new file mode 100644
index 0000000..60c25ed
--- /dev/null
+++ b/debian/patches/02_hide_panoramix_symbol.diff
@@ -0,0 +1,13 @@
+diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
+index 334c71f..309954d 100644
+--- a/xfixes/xfixesint.h
++++ b/xfixes/xfixesint.h
+@@ -291,7 +291,7 @@ int
+  SProcXFixesDestroyPointerBarrier(ClientPtr client);
+ 
+ /* Xinerama */
+-extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
++_X_INTERNAL extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
+ void PanoramiXFixesInit(void);
+ void PanoramiXFixesReset(void);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3c8c1a3..810051d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 ## Patches with a number < 100 are applied in debian.
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
+02_hide_panoramix_symbol.diff
 #13_debian_add_xkbpath_env_variable.diff
 05_Revert-Unload-submodules.diff
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff


Reply to: