diff --git a/srcpkgs/xstarter/patches/cmake-build-type-none.patch b/srcpkgs/xstarter/patches/cmake-build-type-none.patch deleted file mode 100644 index a4ee91afec04fa..00000000000000 --- a/srcpkgs/xstarter/patches/cmake-build-type-none.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,16 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - - project(xstarter) - --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)" FORCE) --endif() -- - set(PROJECT_VERSION "0.8.0") --if (CMAKE_BUILD_TYPE STREQUAL Debug) -- set(CMAKE_C_FLAGS "-g -Wall -pedantic") --else() -- set(CMAKE_C_FLAGS "-Wall -pedantic -O3") --endif() -+set(CMAKE_C_FLAGS "-Wall -pedantic ${CMAKE_C_FLAGS}") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin") - - set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") diff --git a/srcpkgs/xstarter/patches/cmake-buildtype-cflags-ncurses.patch b/srcpkgs/xstarter/patches/cmake-buildtype-cflags-ncurses.patch new file mode 100644 index 00000000000000..f72854bdb652cf --- /dev/null +++ b/srcpkgs/xstarter/patches/cmake-buildtype-cflags-ncurses.patch @@ -0,0 +1,32 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,18 +2,11 @@ + + project(xstarter) + +-if (NOT CMAKE_BUILD_TYPE) +- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)" FORCE) +-endif() +- + set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") + + set(PROJECT_VERSION "0.8.2") +-if (CMAKE_BUILD_TYPE STREQUAL Debug) +- set(CMAKE_C_FLAGS "-g -Wall -pedantic") +-else() +- set(CMAKE_C_FLAGS "-Wall -pedantic -O3") +-endif() ++ ++set(CMAKE_C_FLAGS "-fcommon -Wall -pedantic ${CMAKE_C_FLAGS}") + + # cpack + set(CPACK_PACKAGE_CONTACT "Maciej Lechowski") +@@ -42,7 +35,7 @@ + message(STATUS "Cmake build type: " ${CMAKE_BUILD_TYPE}) + message(STATUS "Curses include directory: " ${CURSES_INCLUDE_DIR}) + +-pkg_check_modules(CURSES REQUIRED ncurses) ++pkg_check_modules(CURSES REQUIRED ncursesw) + + add_library(lib-inih STATIC + external/inih/ini.c diff --git a/srcpkgs/xstarter/patches/include-stdlib.patch b/srcpkgs/xstarter/patches/include-stdlib.patch new file mode 100644 index 00000000000000..1d07fe42255a0d --- /dev/null +++ b/srcpkgs/xstarter/patches/include-stdlib.patch @@ -0,0 +1,7 @@ +--- a/tests/test_xs_dirname.h ++++ b/tests/test_xs_dirname.h +@@ -1,3 +1,4 @@ ++#include + #include "../src/utils_string.h" + #include "../src/utils.h" + diff --git a/srcpkgs/xstarter/template b/srcpkgs/xstarter/template index 9e632fb23e9116..43c8db8b7a8ef8 100644 --- a/srcpkgs/xstarter/template +++ b/srcpkgs/xstarter/template @@ -1,18 +1,14 @@ # Template file for 'xstarter' pkgname=xstarter -version=0.8.0 -revision=2 +version=0.8.2 +revision=1 build_style=cmake hostmakedepends="pkg-config" -makedepends="glib-devel ncurses-devel" +makedepends="ncurses-devel inih-devel" short_desc="Application launcher for Linux" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/lchsk/xstarter" changelog="https://raw.githubusercontent.com/lchsk/xstarter/master/CHANGELOG" distfiles="https://github.com/lchsk/xstarter/archive/v${version}.tar.gz" -checksum=cb82bf837a2693cbbad468812d517256e079d6aae56dde770d473b245603030a - -pre_configure() { - vsed -i CMakeLists.txt -e's;-Wall;-fcommon &;' -} +checksum=52e09af2ccc2e6a5eccddaa209ee4eaf2ce4c7663a3bec6c25e1c516a1b32d6e