From 86a89c046ed3be584fc72fd6bbcfa1a365b32feb Mon Sep 17 00:00:00 2001
From: Xavier <sapphirus@azorium.net>
Date: Mon, 31 Jul 2023 03:10:52 -0400
Subject: [PATCH] Update to 0.2.106

- Removed warning message during build preparation to inform of the
  introduction of meta packages
- Removed deprecated build option
- Checking out commit 24ae3d0 to rectify build problems
  for ocp-curses with 0.2.106
---
 .SRCINFO | 12 ++++++------
 PKGBUILD | 10 ++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e1dc114..3a55ab5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ocp
 	pkgdesc = Open Cubic Player
-	pkgver = 0.2.105
+	pkgver = 0.2.106
 	pkgrel = 1
 	url = https://stian.cubic.org/project-ocp.php
 	arch = i686
@@ -24,7 +24,7 @@ pkgbase = ocp
 	optdepends = libvorbis: Vorbis codec support
 	optdepends = libmad: MPEG codec support
 	optdepends = flac: FLAC codec support
-	source = ocp::git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.105
+	source = ocp::git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.106
 	sha256sums = SKIP
 
 pkgname = ocp
@@ -35,8 +35,8 @@ pkgname = ocp
 	depends = zlib
 	depends = libancient
 	depends = libdiscid
-	provides = ocp=0.2.105
-	provides = ocp-curses=0.2.105
+	provides = ocp=0.2.106
+	provides = ocp-curses=0.2.106
 	conflicts = ocp-curses
 	conflicts = ocp-sdl2
 
@@ -56,8 +56,8 @@ pkgname = ocp-sdl2
 	depends = libjpeg-turbo
 	depends = libpng
 	depends = ttf-unifont
-	provides = ocp=0.2.105
-	provides = ocp-sdl2=0.2.105
+	provides = ocp=0.2.106
+	provides = ocp-sdl2=0.2.106
 	conflicts = ocp
 	conflicts = ocp-sdl2
 	conflicts = ocp-curses
diff --git a/PKGBUILD b/PKGBUILD
index 434e70e..d6f7e7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgbase=ocp
 pkgname=('ocp' 'ocp-sdl2')
-pkgver=0.2.105
+pkgver=0.2.106
 pkgrel=1
 pkgdesc="Open Cubic Player"
 arch=('i686' 'x86_64')
@@ -34,12 +34,8 @@ makedepends=('alsa-lib'
 	     'libvorbis')
 
 prepare() {
-	echo -e "\033[1;31m##!! NOTICE !!##\033[0m"
-	echo -e "\033[0;33mStarting with ocp 0.2.103, the ocp package has been split into two meta packages."
-	echo "Depending upon which features you use, no action will need to be taken."
-	echo -e "X11/SDL2 functionality is now provided by the ocp-sdl2 meta package.\033[0m"
-	echo  "Thanks for flying ocp in the AUR! :)"
         cd $_pkgbase
+	git checkout 24ae3d0 -q # Fixes build problem without X11&SDL for ocp-curses
 	git submodule init
 	git submodule update --init --recursive
 }
@@ -49,7 +45,6 @@ build() {
 	./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core cross_compiling=yes\
 	    	    --without-update-desktop-database\
 		    --without-update-mime-database\
-		    --with-unifontdir=/usr/share/fonts/Unifont\
 		    --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf\
 		    --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf\
 		    --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf
@@ -80,7 +75,6 @@ package_ocp-sdl2() {
 		    --without-sdl --without-x11\
 		    --without-update-desktop-database\
                     --without-update-mime-database\
-                    --with-unifontdir=/usr/share/fonts/Unifont\
                     --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf\
                     --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf\
                     --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf