mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
libxdg_basedir, remove old bep file/patch, bump version (#1300)
This commit is contained in:
Schrijvers Luc
committed by
waddlesplash
waddlesplash
parent
f27f8fb8c1
commit
c455ccfd61
@@ -1,22 +0,0 @@
|
||||
DESCRIPTION="Small library to access XDG Base Directories Specification paths"
|
||||
HOMEPAGE="http://standards.freedesktop.org/basedir-spec/"
|
||||
SOURCE_URI="http://n.ethz.ch/student/nevillm/download/libxdg-basedir/libxdg-basedir-1.1.1.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5="7c64a28b08c8fdf6c8a95b0d5f1497b0"
|
||||
BUILD()
|
||||
{
|
||||
cd libxdg-basedir-1.1.1
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd libxdg-basedir-1.1.1
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="MIT"
|
||||
COPYRIGHT="2007 Mark Nevill"
|
||||
66
dev-libs/libxdg_basedir/libxdg_basedir-1.2.0.recipe
Normal file
66
dev-libs/libxdg_basedir/libxdg_basedir-1.2.0.recipe
Normal file
@@ -0,0 +1,66 @@
|
||||
SUMMARY="Implementation of the XDG Base Directory Specifications"
|
||||
DESCRIPTION="Small library to access XDG Base Directories Specification paths"
|
||||
HOMEPAGE="https://github.com/devnev/libxdg-basedir"
|
||||
COPYRIGHT="2012 Mark Nevill"
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="1c2b0032a539033313b5be2e48ddd0ae94c84faf21d93956d53562eef4614868"
|
||||
SOURCE_DIR="libxdg-basedir-libxdg-basedir-$portVersion"
|
||||
PATCHES="libxdg_basedir-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
libxdg_basedir$secondaryArchSuffix = $portVersion
|
||||
lib:libxdg_basedir$secondaryArchSuffix = $portVersion compat >= 1
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libxdg_basedir${secondaryArchSuffix}_devel
|
||||
devel:libxdg_basedir$secondaryArchSuffix = $portVersion compat >= 1
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libxdg_basedir$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -vfi
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/*.la
|
||||
|
||||
prepareInstalledDevelLib libxdg-basedir
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
diff -urN libxdg-basedir-1.1.1/src/basedir.c libxdg-basedir-1.1.1-haiku/src/basedir.c
|
||||
--- libxdg-basedir-1.1.1/src/basedir.c 2010-07-13 05:48:54.053739520 +0000
|
||||
+++ libxdg-basedir-1.1.1-haiku/src/basedir.c 2010-09-27 04:14:36.000000000 +0000
|
||||
@@ -567,9 +567,9 @@
|
||||
char *relhome;
|
||||
if (!(relhome = xdgEnvDup(envname)) && errno != ENOMEM)
|
||||
{
|
||||
- errno = 0;
|
||||
const char *home;
|
||||
unsigned int homelen;
|
||||
+ errno = 0;
|
||||
if (!(home = xdgGetEnv("HOME")))
|
||||
return NULL;
|
||||
if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
|
||||
diff -urN libxdg-basedir-1.1.1/tests/testquery.c libxdg-basedir-1.1.1-haiku/tests/testquery.c
|
||||
--- libxdg-basedir-1.1.1/tests/testquery.c 2010-07-13 05:48:54.050331648 +0000
|
||||
+++ libxdg-basedir-1.1.1-haiku/tests/testquery.c 2010-09-27 04:17:53.000000000 +0000
|
||||
@@ -49,6 +49,7 @@
|
||||
{
|
||||
if (argc < 3)
|
||||
return 1;
|
||||
+ {
|
||||
char *datatype = argv[1];
|
||||
char *querytype = argv[2];
|
||||
if (strcmp(datatype, "data") == 0)
|
||||
@@ -87,4 +88,5 @@
|
||||
else
|
||||
return 1;
|
||||
return 0;
|
||||
+ }
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
From 240c884095f7ffbe2c9958032b7584136e45e63c Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Mon, 24 Apr 2017 20:38:30 +0200
|
||||
Subject: import patch from version 1.1.1
|
||||
|
||||
|
||||
diff --git a/src/basedir.c b/src/basedir.c
|
||||
index 68ab879..7506f55 100644
|
||||
--- a/src/basedir.c
|
||||
+++ b/src/basedir.c
|
||||
@@ -569,9 +569,9 @@ static char * xdgGetRelativeHome(const char *envname, const char *relativefallba
|
||||
char *relhome;
|
||||
if (!(relhome = xdgEnvDup(envname)) && errno != ENOMEM)
|
||||
{
|
||||
- errno = 0;
|
||||
const char *home;
|
||||
unsigned int homelen;
|
||||
+ errno = 0;
|
||||
if (!(home = xdgGetEnv("HOME")))
|
||||
return NULL;
|
||||
if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
|
||||
diff --git a/tests/testquery.c b/tests/testquery.c
|
||||
index 53c8e6e..7f4945e 100644
|
||||
--- a/tests/testquery.c
|
||||
+++ b/tests/testquery.c
|
||||
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
if (argc < 3)
|
||||
return 1;
|
||||
+ {
|
||||
char *datatype = argv[1];
|
||||
char *querytype = argv[2];
|
||||
if (strcmp(datatype, "data") == 0)
|
||||
@@ -98,4 +99,5 @@ int main(int argc, char *argv[])
|
||||
else
|
||||
return 1;
|
||||
return 0;
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.7.0
|
||||
|
||||
Reference in New Issue
Block a user