]> source.dussan.org Git - tigervnc.git/commitdiff
projects / tigervnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3e5527)
Apply latest fltk patches to rpm-based packages 32/head
authorBrian P. Hinz <bphinz@users.sf.net>
Wed, 17 Sep 2014 02:03:58 +0000 (22:03 -0400)
committerBrian P. Hinz <bphinz@users.sf.net>
Wed, 17 Sep 2014 02:03:58 +0000 (22:03 -0400)
contrib/packages/rpm/el5/SPECS/tigervnc.spec patch | blob | history
contrib/packages/rpm/el6/SPECS/tigervnc.spec patch | blob | history
contrib/packages/rpm/sle11/SPECS/tigervnc.spec patch | blob | history

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index f2e58b632962ad9ae5b249d4139d508b42b1055a..08078d46385a9f73196bfcedcb5fd51251e2f9c6 100644 (file)
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -153,41 +153,6 @@ Patch13: tigervnc11-rh692048.patch
 Patch101: tigervnc-ac-compatibility.patch
 Patch102: tigervnc-xorg-1.7.5-remove-copyisolatin1lowered.patch
 
-# Export dead key information from FLTK to the apps
-# http://www.fltk.org/str.php?L2599
-Patch110: http://www.fltk.org/strfiles/2599/fltk-1_v4.3.x-keyboard-x11.patch
-Patch111: http://www.fltk.org/strfiles/2599/fltk-1_v4.3.x-keyboard-win32.patch
-Patch112: http://www.fltk.org/strfiles/2599/fltk-1_v6.3.x-keyboard-osx.patch
-
-# Notify applications of changes to the clipboard
-# http://www.fltk.org/str.php?L2636
-Patch113: http://www.fltk.org/strfiles/2636/fltk-1.3.x-clipboard.patch
-Patch114: http://www.fltk.org/strfiles/2636/fltk-1_v6.3.x-clipboard-x11.patch
-Patch115: http://www.fltk.org/strfiles/2636/fltk-1_v3.3.x-clipboard-win32-fix.patch
-Patch116: http://www.fltk.org/strfiles/2636/fltk-1_v2.3.x-clipboard-win32.patch
-Patch117: http://www.fltk.org/strfiles/2636/fltk-1_v2.3.x-clipboard-osx.patch
-
-# Ability to convert a Fl_Pixmap to a Fl_RGB_Image
-# http://www.fltk.org/str.php?L2659
-Patch118: http://www.fltk.org/strfiles/2659/pixmap_v2.patch
-
-# Support for custom cursors
-# http://www.fltk.org/str.php?L2660
-Patch119: http://www.fltk.org/strfiles/2660/fltk-1_v5.3.x-cursor.patch
-
-# Improve modality interaction with WM
-# http://www.fltk.org/str.php?L2802
-Patch120: http://www.fltk.org/strfiles/2802/fltk-1_v2.3.0-modal.patch
-
-# Window icons
-# http://www.fltk.org/str.php?L2816
-Patch121: http://www.fltk.org/strfiles/2816/fltk-1_v3.3.0-icons.patch
-
-# Multihead
-# http://fltk.org/str.php?L2860
-Patch122: http://www.fltk.org/strfiles/2860/fltk-1.3.x-screen_num.patch
-Patch123: http://www.fltk.org/strfiles/2860/fltk-1_v3.3.x-multihead.patch
-
 # Patches from libdrm-2.4.15-4.fc12.src.rpm
 # hardcode the 666 instead of 660 for device nodes
 Patch133: libdrm-make-dri-perms-okay.patch
@@ -505,20 +470,10 @@ rm -rf %{_builddir}/%{name}-%{version}%{?snap:-%{snap}}
 
 tar xzf %SOURCE11
 pushd fltk-*
-%patch110 -p1 -b .keyboard-x11
-%patch111 -p1 -b .keyboard-win32
-%patch112 -p1 -b .keyboard-osx
-%patch113 -p1 -b .clipboard
-%patch114 -p1 -b .clipboard-x11
-%patch115 -p1 -b .clipboard-win32-fix
-%patch116 -p1 -b .clipboard-win32
-%patch117 -p1 -b .clipboard-osx
-%patch118 -p1 -b .pixmap
-%patch119 -p1 -b .cursor
-%patch120 -p1 -b .modal
-%patch121 -p1 -b .icons
-%patch122 -p1 -b .screen_num
-%patch123 -p1 -b .multihead
+for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ;
+do
+  patch -p1 -i $p
+done
 popd
 
 tar xzf %SOURCE12
diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index e33f0a3b75bf68502bb5c735625392e0c8a64f91..aaf0ce382138654498cabf668612ed11e0fb9c43 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -48,41 +48,6 @@ Patch11: tigervnc11-gethomedir.patch
 Patch13: tigervnc11-rh692048.patch
 Patch16: tigervnc-xorg-manpages.patch
 
-# Export dead key information from FLTK to the apps
-# http://www.fltk.org/str.php?L2599
-Patch110: http://www.fltk.org/strfiles/2599/fltk-1_v4.3.x-keyboard-x11.patch
-Patch111: http://www.fltk.org/strfiles/2599/fltk-1_v4.3.x-keyboard-win32.patch
-Patch112: http://www.fltk.org/strfiles/2599/fltk-1_v6.3.x-keyboard-osx.patch
-
-# Notify applications of changes to the clipboard
-# http://www.fltk.org/str.php?L2636
-Patch113: http://www.fltk.org/strfiles/2636/fltk-1.3.x-clipboard.patch
-Patch114: http://www.fltk.org/strfiles/2636/fltk-1_v6.3.x-clipboard-x11.patch
-Patch115: http://www.fltk.org/strfiles/2636/fltk-1_v3.3.x-clipboard-win32-fix.patch
-Patch116: http://www.fltk.org/strfiles/2636/fltk-1_v2.3.x-clipboard-win32.patch
-Patch117: http://www.fltk.org/strfiles/2636/fltk-1_v2.3.x-clipboard-osx.patch
-
-# Ability to convert a Fl_Pixmap to a Fl_RGB_Image
-# http://www.fltk.org/str.php?L2659
-Patch118: http://www.fltk.org/strfiles/2659/pixmap_v2.patch
-
-# Support for custom cursors
-# http://www.fltk.org/str.php?L2660
-Patch119: http://www.fltk.org/strfiles/2660/fltk-1_v5.3.x-cursor.patch
-
-# Improve modality interaction with WM
-# http://www.fltk.org/str.php?L2802
-Patch120: http://www.fltk.org/strfiles/2802/fltk-1_v2.3.0-modal.patch
-
-# Window icons
-# http://www.fltk.org/str.php?L2816
-Patch121: http://www.fltk.org/strfiles/2816/fltk-1_v3.3.0-icons.patch
-
-# Multihead
-# http://fltk.org/str.php?L2860
-Patch122: http://www.fltk.org/strfiles/2860/fltk-1.3.x-screen_num.patch
-Patch123: http://www.fltk.org/strfiles/2860/fltk-1_v3.3.x-multihead.patch
-
 %description
 Virtual Network Computing (VNC) is a remote display system which
 allows you to view a computing 'desktop' environment not only on the
@@ -179,20 +144,10 @@ This package contains icons for TigerVNC viewer
 
 tar xzf %SOURCE11
 pushd fltk-*
-%patch110 -p1 -b .keyboard-x11
-%patch111 -p1 -b .keyboard-win32
-%patch112 -p1 -b .keyboard-osx
-%patch113 -p1 -b .clipboard
-%patch114 -p1 -b .clipboard-x11
-%patch115 -p1 -b .clipboard-win32-fix
-%patch116 -p1 -b .clipboard-win32
-%patch117 -p1 -b .clipboard-osx
-%patch118 -p1 -b .pixmap
-%patch119 -p1 -b .cursor
-%patch120 -p1 -b .modal
-%patch121 -p1 -b .icons
-%patch122 -p1 -b .screen_num
-%patch123 -p1 -b .multihead
+for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ;
+do
+  patch -p1 -i $p
+done
 popd
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index b48303cc71fadd2a5ac96d17192625df7af392f0..5258a9f7d5ba7fdabe2a6dad5db1cdb7fc2c5f25 100644 (file)
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -142,42 +142,6 @@ Patch236:       u_xserver_xvfb-randr.patch
 Patch237:       U_os-Reset-input-buffer-s-ignoreBytes-field.patch
 Patch238:       u_Avoid-use-after-free-in-dix-dixfonts.c-doImageText.patch
 
-# Fltk patches
-# Export dead key information from FLTK to the apps
-# http://www.fltk.org/str.php?L2599
-Patch510: http://www.fltk.org/strfiles/2599/fltk-1_v4.3.x-keyboard-x11.patch
-Patch511: http://www.fltk.org/strfiles/2599/fltk-1_v4.3.x-keyboard-win32.patch
-Patch512: http://www.fltk.org/strfiles/2599/fltk-1_v6.3.x-keyboard-osx.patch
-
-# Notify applications of changes to the clipboard
-# http://www.fltk.org/str.php?L2636
-Patch513: http://www.fltk.org/strfiles/2636/fltk-1.3.x-clipboard.patch
-Patch514: http://www.fltk.org/strfiles/2636/fltk-1_v6.3.x-clipboard-x11.patch
-Patch515: http://www.fltk.org/strfiles/2636/fltk-1_v3.3.x-clipboard-win32-fix.patch
-Patch516: http://www.fltk.org/strfiles/2636/fltk-1_v2.3.x-clipboard-win32.patch
-Patch517: http://www.fltk.org/strfiles/2636/fltk-1_v2.3.x-clipboard-osx.patch
-
-# Ability to convert a Fl_Pixmap to a Fl_RGB_Image
-# http://www.fltk.org/str.php?L2659
-Patch518: http://www.fltk.org/strfiles/2659/pixmap_v2.patch
-
-# Support for custom cursors
-# http://www.fltk.org/str.php?L2660
-Patch519: http://www.fltk.org/strfiles/2660/fltk-1_v5.3.x-cursor.patch
-
-# Improve modality interaction with WM
-# http://www.fltk.org/str.php?L2802
-Patch520: http://www.fltk.org/strfiles/2802/fltk-1_v2.3.0-modal.patch
-
-# Window icons
-# http://www.fltk.org/str.php?L2816
-Patch521: http://www.fltk.org/strfiles/2816/fltk-1_v3.3.0-icons.patch
-
-# Multihead
-# http://fltk.org/str.php?L2860
-Patch522: http://www.fltk.org/strfiles/2860/fltk-1.3.x-screen_num.patch
-Patch523: http://www.fltk.org/strfiles/2860/fltk-1_v3.3.x-multihead.patch
-
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
 a client/server application that allows users to launch and interact with graphical applications on remote machines. 
@@ -272,20 +236,10 @@ popd
 
 tar xzf %SOURCE11
 pushd fltk-*
-%patch510 -p1 -b .keyboard-x11
-%patch511 -p1 -b .keyboard-win32
-%patch512 -p1 -b .keyboard-osx
-%patch513 -p1 -b .clipboard
-%patch514 -p1 -b .clipboard-x11
-%patch515 -p1 -b .clipboard-win32-fix
-%patch516 -p1 -b .clipboard-win32
-%patch517 -p1 -b .clipboard-osx
-%patch518 -p1 -b .pixmap
-%patch519 -p1 -b .cursor
-%patch520 -p1 -b .modal
-%patch521 -p1 -b .icons
-%patch522 -p1 -b .screen_num
-%patch523 -p1 -b .multihead
+for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ;
+do
+  patch -p1 -i $p
+done
 popd
 
 tar xzf %SOURCE12
High performance, multi-platform VNC client and server: https://github.com/TigerVNC/tigervnc