aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-13 20:28:19 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-13 20:28:19 +0200
commita1e309a0fc8d67d6e02a840255bb7c9bd4611cbe (patch)
tree5c339c26cd0953579ce5d1f91bbc286cd870eaa4
parent680de79fb01d426a449806799c4ebae91239a7fb (diff)
parent244ce534a0bea1c5d206471bae6dec88afcda6e2 (diff)
downloadnx-libs-a1e309a0fc8d67d6e02a840255bb7c9bd4611cbe.tar.gz
nx-libs-a1e309a0fc8d67d6e02a840255bb7c9bd4611cbe.tar.bz2
nx-libs-a1e309a0fc8d67d6e02a840255bb7c9bd4611cbe.zip
Merge branch 'sunweaver-pr/enable-mit-screen-saver-extension' into 3.6.x
Attributes GH PR #421: https://github.com/ArcticaProject/nx-libs/pull/421
-rw-r--r--debian/control17
-rw-r--r--debian/nx-x11proto-scrnsaver-dev.install3
-rw-r--r--nx-X11/config/cf/host.def2
-rw-r--r--nx-libs.spec3
4 files changed, 24 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index b1898252f..faa27aadb 100644
--- a/debian/control
+++ b/debian/control
@@ -306,6 +306,23 @@ Description: nx-X11 Render extension wire protocol (dummy package)
.
This package can be safely removed.
+Package: nx-x11proto-scrnsaver-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+ libnx-x11-dev (<< 2:3.5.0.29-1~),
+Description: nx-X11 Screen Saver extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the MIT-SCREEN-SAVER extension, used to notify the server of client
+ screen saver events.
+
Package: libnx-mesa-extras-dev
Section: libdevel
Architecture: any
diff --git a/debian/nx-x11proto-scrnsaver-dev.install b/debian/nx-x11proto-scrnsaver-dev.install
new file mode 100644
index 000000000..952a6c52f
--- /dev/null
+++ b/debian/nx-x11proto-scrnsaver-dev.install
@@ -0,0 +1,3 @@
+usr/include/*/nx-X11/extensions/saver.h
+usr/include/*/nx-X11/extensions/saverproto.h
+usr/include/*/nx-X11/extensions/scrnsaver.h \ No newline at end of file
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 4b22042c4..4d49362f9 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -358,7 +358,7 @@
*
#define BuildScreenSaverExt NO
*/
-#define BuildScreenSaverExt NO
+#define BuildScreenSaverExt YES
/*
* If you don't want to build Xinerama support, uncomment this.
diff --git a/nx-libs.spec b/nx-libs.spec
index ed5e7cb49..afafb3266 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -516,6 +516,9 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%{_includedir}/nx-X11/extensions/recordstr.h
%{_includedir}/nx-X11/extensions/render.h
%{_includedir}/nx-X11/extensions/renderproto.h
+%{_includedir}/nx-X11/extensions/saver.h
+%{_includedir}/nx-X11/extensions/saverproto.h
+%{_includedir}/nx-X11/extensions/scrnsaver.h
%{_includedir}/nx-X11/extensions/securstr.h
%{_includedir}/nx-X11/extensions/syncstr.h
%{_includedir}/nx-X11/extensions/xcmiscstr.h