Update now that Linux build works

Linux compilation has been fixed upstream:
https://github.com/serge-rgb/milton/pull/151

6 files changed, 47 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3d1ff1a3283..43edd9cf052b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 pkgbase = milton-git
 	pkgdesc = An infinite-canvas paint program
-	pkgver = 1.5.0.r145.4dbc26e
+	pkgver = 1.9.0.r9.c2a9dc3
 	pkgrel = 1
 	url = https://github.com/serge-rgb/milton
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = sdl2
 	makedepends = icoutils
+	makedepends = patch
+	makedepends = sdl2
 	depends = opengl-driver
 	depends = gtk2
-	depends = libxi
-	depends = ttf-carlito
 	provides = milton
 	conflicts = milton
 	source = git+https://github.com/serge-rgb/milton.git
-	source = no-main.patch
-	source = carlito-sys.patch
+	source = harfbuzz-cflags.patch
 	source = milton.desktop
 	sha256sums = SKIP
-	sha256sums = 9f97e9a168888d2d5e63e2d04e20c3e1c602ff95a975ccbf6d83537507375b6b
-	sha256sums = 04c4c462cf4ffb712f5df7a5a21013e343fbedd701a4948eaeb4e17915d14b3d
+	sha256sums = 73099b62fd9eb8bcc0bb8f85dfa193925f5f042bc0293090c26d95257d6e08e8
 	sha256sums = 59e5dec9b6ec0cfadc45e56728d83e66e612c84cfa67f15451df38ec0bad55d0
 
 pkgname = milton-git
diff --git a/.gitignore b/.gitignore
index c46696b6bab7..1982dc444e6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /*.pkg.tar.xz
 /src
 /pkg
+milton
diff --git a/PKGBUILD b/PKGBUILD
index f9a1be6058f0..d829001fcfee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,48 @@
-# Maintainer: Jon Gjengset <jon@thesquareplanet.com>
+# Maintainer: Amin Mesbah <dev@aminmesbah.com>
 pkgname=milton-git
-pkgver=1.5.0.r145.4dbc26e
+pkgver=1.9.0.r9.c2a9dc3
 pkgrel=1
-pkgdesc="An infinite-canvas paint program"
-arch=(x86_64)
-url="https://github.com/serge-rgb/milton"
+pkgdesc='An infinite-canvas paint program'
+arch=('x86_64')
+url='https://github.com/serge-rgb/milton'
 license=('GPL')
-groups=()
-depends=('opengl-driver' 'gtk2' 'libxi' 'ttf-carlito')
-makedepends=('git' 'sdl2' 'icoutils')
+depends=('opengl-driver' 'gtk2')
+makedepends=('git' 'icoutils' 'patch' 'sdl2')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-replaces=()
-backup=()
-options=()
-install=
 source=('git+https://github.com/serge-rgb/milton.git'
-        'no-main.patch' 'carlito-sys.patch' 'milton.desktop')
-noextract=()
+        'harfbuzz-cflags.patch'
+        'milton.desktop')
 sha256sums=('SKIP'
-            '9f97e9a168888d2d5e63e2d04e20c3e1c602ff95a975ccbf6d83537507375b6b'
-            '04c4c462cf4ffb712f5df7a5a21013e343fbedd701a4948eaeb4e17915d14b3d'
+            '73099b62fd9eb8bcc0bb8f85dfa193925f5f042bc0293090c26d95257d6e08e8'
             '59e5dec9b6ec0cfadc45e56728d83e66e612c84cfa67f15451df38ec0bad55d0')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	printf "%s" "$(git describe --long | tr -d v | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+    cd "$srcdir/${pkgname%-git}" || exit 1
+    printf "%s" "$(git describe --tags --long | tr -d v | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 prepare() {
-	cd "$srcdir/${pkgname%-git}"
-	patch -Np1 -i "${srcdir}/no-main.patch"
-	patch -Np1 -i "${srcdir}/carlito-sys.patch"
+    cd "$srcdir/${pkgname%-git}" || exit 1
+    patch -Np1 -i "${srcdir}/harfbuzz-cflags.patch"
 }
 
 build() {
-	cd "$srcdir/${pkgname%-git}"
-
-	# see build-lin.sh in the git repo
-	pushd third_party/SDL2-2.0.8
-	mkdir -p build/linrelease
-	pushd build/linrelease > /dev/null
-	cmake \
-	    -D ARTS:BOOL=OFF \
-	    -D ALSA:BOOL=OFF \
-	    -D PULSEAUDIO:BOOL=OFF \
-	    -D OSS:BOOL=OFF \
-	    -D ESD:BOOL=OFF \
-	    -D SDL_SHARED:BOOL=OFF \
-	    -D CMAKE_INSTALL_PREFIX="../linux64" \
-	    -G "Unix Makefiles" \
-	    -D CMAKE_DEBUG_POSTFIX="_debug" \
-	    -D SDL_STATIC_PIC:BOOL=ON \
-	    -D CMAKE_BUILD_TYPE="Debug" ../..
-	make install
-	popd > /dev/null
-	popd
-
-	mkdir -p build
-	cd build
-	cmake ..
-	make
+    cd "$srcdir/${pkgname%-git}" || exit 1
+    ./build-lin.sh
 }
 
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	cd build
-	install -Dm755 Milton "${pkgdir}/usr/bin/milton"
-	icotool -x milton_icon.ico
-	for res in 16x16 32x32 48x48 64x64 128x128 256x256; do
-		install -Dm644 milton_icon_*"_${res}x32.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/milton.png"
-	done
-	install -Dm644 "${srcdir}/milton.desktop" "${pkgdir}/usr/share/applications/milton.desktop"
+    cd "$srcdir/${pkgname%-git}" || exit 1
+    cd build || exit 1
+    install -Dm755 Milton "${pkgdir}/usr/bin/milton"
+    icotool -x milton_icon.ico
+    for res in 16x16 32x32 48x48 64x64 128x128 256x256; do
+        install -Dm644 milton_icon_*"_${res}x32.png" \
+                "${pkgdir}/usr/share/icons/hicolor/${res}/apps/milton.png"
+    done
+    install -Dm644 "${srcdir}/milton.desktop" "${pkgdir}/usr/share/applications/milton.desktop"
+    install -Dm644 \
+            "${srcdir}/${pkgname%-git}/LICENSE.txt" \
+            "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }
diff --git a/carlito-sys.patch b/carlito-sys.patch
deleted file mode 100644
index a34a7d378bcf..000000000000
--- a/carlito-sys.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sdl_milton.cc b/src/sdl_milton.cc
-index 2384abf..84921c1 100644
---- a/src/sdl_milton.cc
-+++ b/src/sdl_milton.cc
-@@ -794,7 +794,7 @@ milton_main(bool is_fullscreen, char* file_to_open)
-         milton_log("ImGUI setup\n");
-         ImGuiIO& io = ImGui::GetIO();
-         io.IniFilename = NULL;  // Don't save any imgui.ini file
--        PATH_CHAR fname[MAX_PATH] = TO_PATH_STR("Carlito.ttf");
-+        PATH_CHAR fname[MAX_PATH] = TO_PATH_STR("/usr/share/fonts/TTF/Carlito-Regular.ttf");
-         platform_fname_at_exe(fname, MAX_PATH);
-         FILE* fd = platform_fopen(fname, TO_PATH_STR("rb"));
- 
diff --git a/harfbuzz-cflags.patch b/harfbuzz-cflags.patch
new file mode 100644
index 000000000000..251e633b73c5
--- /dev/null
+++ b/harfbuzz-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/build-lin.sh b/build-lin.sh
+index 7716b30..0dfc92d 100755
+--- a/build-lin.sh
++++ b/build-lin.sh
+@@ -32,5 +32,8 @@ popd
+ mkdir -p build
+ cd build
+
++# We must set these cxxflags so harfbuzz header is found:
++# https://gitlab.kitware.com/cmake/cmake/issues/19531
++CXXFLAGS=$(pkgconf --cflags harfbuzz) \
+ cmake $@ .. || exit 1
+ make -j || exit 1
diff --git a/no-main.patch b/no-main.patch
deleted file mode 100644
index f8b31f90c329..000000000000
--- a/no-main.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/unity.cc b/src/unity.cc
-index c244f9c..5e5201e 100644
---- a/src/unity.cc
-+++ b/src/unity.cc
-@@ -28,9 +28,6 @@
- #if !defined(TESTING)
-     #if defined(_WIN32)
-        #include "platform_main_windows.cc"
--    #elif defined(__linux__)
--       #include "platform_main_unix.cc"
--       #include "platform_main_linux.cc"
-     #elif defined(__MACH__)
-        // #include "platform_main_unix.cc"
-     #endif