Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TigerVNC/tigervnc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a96fb2529f9a072c0202eeee12d1e2f9faf50a5
Choose a base ref
..
head repository: TigerVNC/tigervnc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9809c7a4010ac9118cfb12cecb420dd73033966e
Choose a head ref
8 changes: 4 additions & 4 deletions contrib/packages/deb/ubuntu-focal/debian/rules
View file
Original file line number Diff line number Diff line change
@@ -127,8 +127,8 @@ build-arch-stamp:
# Add here command to compile/build the package.
# Build first things.
# Build Xvnc
#make $(NUMJOBS) LDFLAGS="-lpng"
export LDFLAGS="-lpng"; cmake --build . --config Release -v
make $(NUMJOBS) LDFLAGS="-lpng"
#cmake --build . --config Release
make $(NUMJOBS) -C unix/xserver

touch build-arch-stamp
@@ -164,8 +164,8 @@ install: build
dh_prep
dh_installdirs
# Add here commands to install the package into debian/vnc.
#make install DESTDIR=$(CURDIR)/debian/tigervncserver
cmake --install . --component Runtime --prefix $(CURDIR)/debian/tigervncserver
make install DESTDIR=$(CURDIR)/debian/tigervncserver
#cmake --install . --component Runtime --prefix $(CURDIR)/debian/tigervncserver
(cd unix/xserver/hw/vnc; make install DESTDIR=$(CURDIR)/debian/tigervncserver)
# rename server files to tigervnc specific names
mv $(CURDIR)/debian/tigervncserver/usr/bin/Xvnc \
8 changes: 4 additions & 4 deletions contrib/packages/deb/ubuntu-jammy/debian/rules
View file
Original file line number Diff line number Diff line change
@@ -127,8 +127,8 @@ build-arch-stamp:
# Add here command to compile/build the package.
# Build first things.
# Build Xvnc
#make $(NUMJOBS) LDFLAGS="-lpng"
export LDFLAGS="-lpng"; cmake --build . -v --config Release
make $(NUMJOBS) LDFLAGS="-lpng"
#cmake --build . --config Release
make $(NUMJOBS) -C unix/xserver

touch build-arch-stamp
@@ -164,8 +164,8 @@ install: build
dh_prep
dh_installdirs
# Add here commands to install the package into debian/vnc.
#make install DESTDIR=$(CURDIR)/debian/tigervncserver
cmake --install . --component Runtime --prefix $(CURDIR)/debian/tigervncserver
make install DESTDIR=$(CURDIR)/debian/tigervncserver
#cmake --install . --component Runtime --prefix $(CURDIR)/debian/tigervncserver
(cd unix/xserver/hw/vnc; make install DESTDIR=$(CURDIR)/debian/tigervncserver)
# rename server files to tigervnc specific names
mv $(CURDIR)/debian/tigervncserver/usr/bin/Xvnc \
8 changes: 4 additions & 4 deletions contrib/packages/deb/ubuntu-noble/debian/rules
View file
Original file line number Diff line number Diff line change
@@ -127,8 +127,8 @@ build-arch-stamp:
# Add here command to compile/build the package.
# Build first things.
# Build Xvnc
#make $(NUMJOBS) LDFLAGS="-lpng"
export LDFLAGS="-lpng"; cmake --build . -v --config Release
make $(NUMJOBS) LDFLAGS="-lpng"
#cmake --build . --config Release
make $(NUMJOBS) -C unix/xserver

touch build-arch-stamp
@@ -164,8 +164,8 @@ install: build
dh_prep
dh_installdirs
# Add here commands to install the package into debian/vnc.
#make install DESTDIR=$(CURDIR)/debian/tigervncserver
cmake --install . -v --component Runtime --prefix $(CURDIR)/debian/tigervncserver
make install DESTDIR=$(CURDIR)/debian/tigervncserver
#cmake --install . -v --component Runtime --prefix $(CURDIR)/debian/tigervncserver
(cd unix/xserver/hw/vnc; make install DESTDIR=$(CURDIR)/debian/tigervncserver)
# rename server files to tigervnc specific names
mv $(CURDIR)/debian/tigervncserver/usr/bin/Xvnc \
2 changes: 1 addition & 1 deletion po/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ foreach(lang ${po_FILES})
)

install(FILES ${mo}
DESTINATION "${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES"
DESTINATION "${CMAKE_INSTALL_FULL_LOCALEDIR}/${lang}/LC_MESSAGES"
COMPONENT Runtime
RENAME tigervnc.mo
)
4 changes: 2 additions & 2 deletions release/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -73,5 +73,5 @@ endif() #UNIX
# Common
#

install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT Runtime)
install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT Runtime)
install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR} COMPONENT Runtime)
install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR} COMPONENT Runtime)
4 changes: 2 additions & 2 deletions unix/vncconfig/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ target_include_directories(vncconfig PUBLIC ${CMAKE_SOURCE_DIR}/unix/tx)
target_link_libraries(vncconfig tx tigervnc ${X11_LIBRARIES})

install(TARGETS vncconfig
DESTINATION ${CMAKE_INSTALL_BINDIR}
DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
COMPONENT Runtime)
install(FILES vncconfig.man
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1
COMPONENT Runtime
RENAME vncconfig.1
)
4 changes: 2 additions & 2 deletions unix/vncpasswd/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ if(PWQUALITY_FOUND)
endif()

install(TARGETS vncpasswd
DESTINATION ${CMAKE_INSTALL_BINDIR}
DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
COMPONENT Runtime)
install(FILES vncpasswd.man
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1
COMPONENT Runtime
RENAME vncpasswd.1
)
18 changes: 9 additions & 9 deletions unix/vncserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -6,18 +6,18 @@ configure_file(vncsession-start.in vncsession-start @ONLY)
configure_file(vncserver.in vncserver @ONLY)
configure_file(vncsession.man.in vncsession.man @ONLY)

install(TARGETS vncsession DESTINATION ${CMAKE_INSTALL_SBINDIR} COMPONENT Runtime)
install(FILES tigervnc.pam DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/pam.d COMPONENT Runtime RENAME tigervnc)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncsession.man DESTINATION ${CMAKE_INSTALL_MANDIR}/man8 COMPONENT Runtime RENAME vncsession.8)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vncserver DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} COMPONENT Runtime)
install(FILES vncserver.man DESTINATION ${CMAKE_INSTALL_MANDIR}/man8 COMPONENT Runtime RENAME vncserver.8)
install(FILES vncserver-config-defaults vncserver-config-mandatory DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/tigervnc COMPONENT Runtime)
install(TARGETS vncsession DESTINATION ${CMAKE_INSTALL_FULL_SBINDIR} COMPONENT Runtime)
install(FILES tigervnc.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d COMPONENT Runtime RENAME tigervnc)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncsession.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man8 COMPONENT Runtime RENAME vncsession.8)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vncserver DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR} COMPONENT Runtime)
install(FILES vncserver.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man8 COMPONENT Runtime RENAME vncserver.8)
install(FILES vncserver-config-defaults vncserver-config-mandatory DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/tigervnc COMPONENT Runtime)

install(FILES vncserver.users DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/tigervnc COMPONENT Runtime)
install(FILES vncserver.users DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/tigervnc COMPONENT Runtime)

install(FILES HOWTO.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT Runtime)
install(FILES HOWTO.md DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR} COMPONENT Runtime)

if(INSTALL_SYSTEMD_UNITS)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncserver@.service DESTINATION ${CMAKE_INSTALL_FULL_UNITDIR} COMPONENT Runtime)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vncsession-start DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} COMPONENT Runtime)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vncsession-start DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR} COMPONENT Runtime)
endif()
4 changes: 2 additions & 2 deletions unix/x0vncserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -53,5 +53,5 @@ endif()

target_link_libraries(x0vncserver ${X11_LIBRARIES})

install(TARGETS x0vncserver DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
install(FILES x0vncserver.man DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT Runtime RENAME x0vncserver.1)
install(TARGETS x0vncserver DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT Runtime)
install(FILES x0vncserver.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1 COMPONENT Runtime RENAME x0vncserver.1)
12 changes: 6 additions & 6 deletions vncviewer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -69,11 +69,11 @@ else()
endif()

install(TARGETS vncviewer
DESTINATION ${CMAKE_INSTALL_BINDIR}
DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
COMPONENT Runtime)
if(UNIX)
install(FILES vncviewer.man
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1
COMPONENT Runtime
RENAME vncviewer.1
)
@@ -114,7 +114,7 @@ if(UNIX)
endif()
add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications
COMPONENT Runtime)

if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.19.6)
@@ -146,17 +146,17 @@ if(UNIX)
endif()
add_custom_target(appstream ALL DEPENDS org.tigervnc.vncviewer.metainfo.xml)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tigervnc.vncviewer.metainfo.xml
DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo
DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo
COMPONENT Runtime)

foreach(res 16 22 24 32 48 64 128)
install(FILES ../media/icons/tigervnc_${res}.png
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${res}x${res}/apps
DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${res}x${res}/apps
COMPONENT Runtime
RENAME tigervnc.png
)
endforeach()
install(FILES ../media/icons/tigervnc.svg
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps
COMPONENT Runtime)
endif()
2 changes: 1 addition & 1 deletion win/vncconfig/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,6 @@ target_include_directories(vncconfig PUBLIC ${CMAKE_BINARY_DIR}/win)
target_link_libraries(vncconfig rfb_win32 tigervnc ws2_32.lib)

install(TARGETS vncconfig
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
COMPONENT Runtime
)
2 changes: 1 addition & 1 deletion win/winvnc/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,6 @@ target_include_directories(winvnc4 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(winvnc4 rfb_win32 tigervnc ws2_32.lib)

install(TARGETS winvnc4
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
COMPONENT Runtime
)
2 changes: 1 addition & 1 deletion win/wm_hooks/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,6 @@ target_include_directories(wm_hooks PUBLIC ${CMAKE_BINARY_DIR}/win)
target_include_directories(wm_hooks PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

install(TARGETS wm_hooks
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
COMPONENT Runtime
)