Diasurgical master (#336)

* Debian Package update * Missing font & icons fix * Fedora package update * Fedora package update * Fixing #333 Linux Font Path problem * use of TTF_FONT_PATH
7 years ago · ab60df6618
9 changed files with 59 additions and 27 deletions
--- a/Packaging/debian/changelog
+++ b/Packaging/debian/changelog
@ -1,6 +1,14 @@
-devilutionx (0.5.0) UNRELEASED; urgency=medium
+devilutionx (0.5.0.3) UNRELEASED; urgency=medium

-  * Ubuntu build
+  * Hardcoded font path fix
+
+ -- Vítězslav Dvořák <info@vitexsoftware.cz>  Mon, 07 Oct 2019 23:35:11 +0200
+
+devilutionx (0.5.0.2) UNRELEASED; urgency=medium
+
+  [ Vítězslav Dvořák ]
+    Missing font hotfix
+  * 

 -- root <root@ubuntu1804.localdomain>  Sat, 05 Oct 2019 12:04:39 +0000

@ -9,4 +17,4 @@ devilutionx (0.4.0) bionic; urgency=medium
  [ Vítězslav Dvořák ]
  * Non-maintainer upload.

- -- root <root@ubuntu1804.localdomain>  Sat, 05 Oct 2019 12:03:04 +0000
+ -- Vítězslav Dvořák <info@vitexsoftware.cz>  Fri, 28 Jun 2019 22:55:11 +0200
--- a/Packaging/debian/control
+++ b/Packaging/debian/control
@ -21,7 +21,7 @@ Description: Diablo build for modern operating systems
 the best games of the 1990s 

 Package: diablo-data
-Architecture: any
+Architecture: all
 Depends:
 ${shlibs:Depends},
 ${misc:Depends},
--- a/Packaging/debian/devilutionx.install
+++ b/Packaging/debian/devilutionx.install
@ -1,6 +1,10 @@
-Packaging/fedora/devilutionx.desktop 	usr/share/applications/
+Packaging/fedora/devilutionx.desktop usr/share/applications/
 obj-x86_64-linux-gnu/devilutionx     	usr/share/games/diablo/
 Packaging/resources/Diablo_48.png	usr/share/icons/hicolor/48x48/apps
 Packaging/resources/Diablo_32.png	usr/share/icons/hicolor/32x32/apps
 Packaging/resources/16.png		usr/share/icons/hicolor/16x16/apps
-Packaging/resources/CharisSILB.ttf	debian/diablo-data/usr/share/fonts/truetype
+Packaging/resources/CharisSILB.ttf	usr/share/fonts/truetype
+Packaging/resources/16.png 		usr/share/icons/hicolor/16x16/apps/
+Packaging/resources/Diablo_32.png 	usr/share/icons/hicolor/32x32/apps/
+Packaging/resources/Diablo_48.png 	usr/share/icons/hicolor/48x48/apps/
+
--- a/Packaging/debian/devilutionx.links
+++ b/Packaging/debian/devilutionx.links
@ -1,3 +1,3 @@
-/usr/share/games/diablo/devilutionx	/usr/games/devilutionx
+/usr/share/games/diablo/devilutionx	/usr/games/devilutionx 


--- a/Packaging/debian/rules
+++ b/Packaging/debian/rules
@ -5,11 +5,11 @@
 export DH_VERBOSE=1
 export COMPILE_FLAGS="-O0"

-#export DH_VERBOSE = 1
+export DH_VERBOSE = 1
 export DEB_BUILD_MAINT_OPTIONS = hardening=-all
-export DEB_CFLAGS_MAINT_APPEND  = -Wno-error
+export DEB_CFLAGS_MAINT_APPEND  = -Wno-error 
 export DEB_LDFLAGS_MAINT_APPEND = -Wno-error
-
+export CXXFLAGS="-DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""

 %:
 	dh $@ --buildsystem=cmake
@ -22,10 +22,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wno-error
 override_dh_auto_install:
 	mkdir -p debian/diablo-data/usr/share/games/diablo/
 	test -f "../diabdat.mpq" && cp ../diabdat.mpq debian/diablo-data/usr/share/games/diablo/ || true
-	mkdir -p debian/diablo-data/usr/share/icons/hicolor/16x16/apps/
-	mkdir -p debian/diablo-data/usr/share/icons/hicolor/32x32/apps/
-	mkdir -p debian/diablo-data/usr/share/icons/hicolor/48x48/apps/
-	cp Packaging/resources/16.png debian/diablo-data/usr/share/icons/hicolor/16x16/apps/diablo.png 
-	cp Packaging/resources/Diablo_32.png debian/diablo-data/usr/share/icons/hicolor/32x32/apps/diablo.png 
-	cp Packaging/resources/Diablo_48.png debian/diablo-data/usr/share/icons/hicolor/48x48/apps/diablo.png 
 	dh_auto_install
+	mkdir -p debian/devilutionx/usr/share/icons/hicolor/16x16/apps/
+	mkdir -p debian/devilutionx/usr/share/icons/hicolor/32x32/apps/
+	mkdir -p debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
+	cp Packaging/resources/16.png debian/devilutionx/usr/share/icons/hicolor/16x16/apps/diablo.png 
+	cp Packaging/resources/Diablo_32.png debian/devilutionx/usr/share/icons/hicolor/32x32/apps/diablo.png 
+	cp Packaging/resources/Diablo_48.png debian/devilutionx/usr/share/icons/hicolor/48x48/apps/diablo.png 
--- a/Packaging/fedora/devilutionx.desktop
+++ b/Packaging/fedora/devilutionx.desktop
@ -3,7 +3,7 @@ Name=devilutionX
 GenericName=DevilutionX
 Comment=Play Diablo I on Linux
 Exec=devilutionx
-Icon=/usr/share/pixmaps/devilutionx.ico
+Icon=devilutionx.png
 Terminal=false
 Type=Application
 X-DCOP-ServiceType=Multi
--- a/Packaging/fedora/devilutionx.spec
+++ b/Packaging/fedora/devilutionx.spec
@ -1,13 +1,13 @@
 %define debug_package %{nil}

 Name:		devilutionx
-Version:	0.4.0
+Version:	0.5.0
 Release:	1%{?dist}
 Summary:	Diablo I engine for modern operating systems

 License:	Unlicensed
-URL:		https://github.com/diasurgical/devilutionX
-Source0:	https://github.com/diasurgical/devilutionX/archive/%{version}.tar.gz
+URL:		https://github.com/Vitexus/devilutionX
+Source0:	https://github.com/Vitexus/devilutionX/archive/%{version}.tar.gz
 Source1:	devilutionx.desktop

 BuildRequires:	cmake gcc gcc-c++ libstdc++-static glibc desktop-file-utils
@ -22,21 +22,37 @@ Note: Devilution requires an original copy of diabdat.mpq. None of the Diablo 1
 %setup -q -n devilutionX-%{version}

 %build
-cmake -DBINARY_RELEASE=ON -DDEBUG=OFF
-make %{?_smp_mflags}
+mkdir -p build
+rm -rf build/*
+cd build
+export CXXFLAGS="-DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
+cmake ..
+cmake --build .
+cd ..

 %install
+cd build
 make INSTALL_ROOT=%{buildroot}
+cd ..
 mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -m 755 devilutionx %{buildroot}%{_bindir}/%{name}
-install -p -D -m644 Diablo.ico %{buildroot}%{_datadir}/pixmaps/%{name}.ico
+
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+install -p -D -m644 Packaging/resources/16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -p -D -m644 Packaging/resources/Diablo_32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -D -m644 Packaging/resources/Diablo_48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+install -m 755 build/devilutionx %{buildroot}%{_bindir}/%{name}
 desktop-file-install --remove-category="Qt" --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} 

 %files
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.ico
+%{_datadir}/fonts/truetype/CharisSILB.ttf
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png

 %post
 # print info
--- a/SourceX/DiabloUI/fonts.cpp
+++ b/SourceX/DiabloUI/fonts.cpp
@ -58,7 +58,7 @@ void LoadTtfFont() {
 		atexit(TTF_Quit);
 	}

-	font = TTF_OpenFont("CharisSILB.ttf", 17);
+	font = TTF_OpenFont(TTF_FONT_PATH, 17);
 	if (font == NULL) {
 		printf("TTF_OpenFont: %s\n", TTF_GetError());
 		return;
--- a/SourceX/DiabloUI/fonts.h
+++ b/SourceX/DiabloUI/fonts.h
@ -6,6 +6,10 @@

 #include "DiabloUI/art.h"

+#ifndef TTF_FONT_PATH
+#define TTF_FONT_PATH "CharisSILB.ttf"
+#endif
+
 namespace dvl {

 enum _artFontTables {