Date: Thursday, September 27, 2018 @ 17:23:22
Author: bisson
Revision: 335479
db-move: moved jfsutils from [extra] to [core] (x86_64)
Added:
jfsutils/repos/core-x86_64/PKGBUILD
(from rev 335478, jfsutils/repos/extra-x86_64/PKGBUILD)
jfsutils/repos/core-x86_64/inttypes.patch
(from rev 335478, jfsutils/repos/extra-x86_64/inttypes.patch)
jfsutils/repos/core-x86_64/sysmacros.patch
(from rev 335478, jfsutils/repos/extra-x86_64/sysmacros.patch)
Deleted:
jfsutils/repos/core-x86_64/PKGBUILD
jfsutils/repos/core-x86_64/inttypes.patch
jfsutils/repos/extra-x86_64/
-----------------------------+
/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++
/inttypes.patch | 12 ++++++++++++
core-x86_64/PKGBUILD | 39 ---------------------------------------
core-x86_64/inttypes.patch | 12 ------------
core-x86_64/sysmacros.patch | 15 +++++++++++++++
5 files changed, 68 insertions(+), 51 deletions(-)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2018-09-27 14:24:33 UTC (rev 335478)
+++ core-x86_64/PKGBUILD 2018-09-27 17:23:22 UTC (rev 335479)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-
-pkgname=jfsutils
-pkgver=1.1.15
-pkgrel=5
-pkgdesc='JFS filesystem utilities'
-url='http://jfs.sourceforge.net'
-arch=('x86_64')
-license=('GPL')
-depends=('util-linux')
-source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz";
- 'inttypes.patch')
-sha256sums=('244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d'
- '15ea88350c240b23fe322d4adafbb79c8473b9850495d61efafc7bf68be391b3')
-
-groups=('base')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../inttypes.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sbindir=/usr/bin
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: jfsutils/repos/core-x86_64/PKGBUILD (from rev 335478,
jfsutils/repos/extra-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2018-09-27 17:23:22 UTC (rev 335479)
@@ -0,0 +1,41 @@
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=jfsutils
+pkgver=1.1.15
+pkgrel=6
+pkgdesc='JFS filesystem utilities'
+url='http://jfs.sourceforge.net'
+arch=('x86_64')
+license=('GPL')
+depends=('util-linux')
+source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz";
+ 'inttypes.patch'
+ 'sysmacros.patch')
+sha256sums=('244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d'
+ '15ea88350c240b23fe322d4adafbb79c8473b9850495d61efafc7bf68be391b3'
+ 'fd1a4e794a3bf2ebdb4b81f582e147655d70aadd59689aacea0ccc32c6381a28')
+
+groups=('base')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../inttypes.patch
+ patch -p1 -i ../sysmacros.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: core-x86_64/inttypes.patch
===================================================================
--- core-x86_64/inttypes.patch 2018-09-27 14:24:33 UTC (rev 335478)
+++ core-x86_64/inttypes.patch 2018-09-27 17:23:22 UTC (rev 335479)
@@ -1,12 +0,0 @@
-diff -Naur old/libfs/devices.h new/libfs/devices.h
---- old/libfs/devices.h 2005-11-23 07:43:55.000000000 +1100
-+++ new/libfs/devices.h 2013-01-06 11:30:25.381538024 +1100
-@@ -40,6 +40,8 @@
- #define ERROR_INVALID_PARAMETER 87
- #define ERROR_DISK_FULL 112
-
-+#include <inttypes.h>
-+
- struct stat;
-
- int ujfs_get_dev_size(FILE *, int64_t * size);
Copied: jfsutils/repos/core-x86_64/inttypes.patch (from rev 335478,
jfsutils/repos/extra-x86_64/inttypes.patch)
===================================================================
--- core-x86_64/inttypes.patch (rev 0)
+++ core-x86_64/inttypes.patch 2018-09-27 17:23:22 UTC (rev 335479)
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h 2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h 2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER 87
+ #define ERROR_DISK_FULL 112
+
++#include <inttypes.h>
++
+ struct stat;
+
+ int ujfs_get_dev_size(FILE *, int64_t * size);
Copied: jfsutils/repos/core-x86_64/sysmacros.patch (from rev 335478,
jfsutils/repos/extra-x86_64/sysmacros.patch)
===================================================================
--- core-x86_64/sysmacros.patch (rev 0)
+++ core-x86_64/sysmacros.patch 2018-09-27 17:23:22 UTC (rev 335479)
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580056
+
+--- a/libfs/devices.c
++++ b/libfs/devices.c
+@@ -30,6 +30,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
++#if HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
++
+ #ifdef HAVE_SYS_MOUNT_H
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
