Project

General

Profile

Download (5.95 KB)

Bug #3514 ยป libretools.patch

Patch for nonsystemd/libretools - SolveFinder, 2023-08-04 04:09 PM

View differences:

nonsystemd/libretools/PKGBUILD
13 13 
pkgver=20190907
14 14 
source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver-nonsystemd.tar.gz{,.sig}
15 15 
        "revert.patch::https://git.parabola.nu/packages/libretools.git/patch/?id=42cca853176c9ff23a5d2896f9b132630f034fb7"
16 
        0002-libremakepkg-pacman_5_2.patch)
16 
        0002-libremakepkg-pacman_5_2.patch
17 
        no-pacstrap-d.patch
18 
        disable-ronn.patch)
17 19 
sha256sums=('c9bdc6f422234b6b260349e488266500756857bbb65079783aa5e997b6a2d410'
18 20 
            'SKIP'
19 21 
            '108aa8bbfb1ffe96427540cd8f7788338883b08ad038b2ed426e93ac6c57e91b'
20 
            '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df')
22 
            '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df'
23 
            '0967b6ab7993dc8a15ad4958fcefb2d545f53426f309bcf4d0711cc84c4bd1a6'
24 
            '2ba2b2e048db29a12699ba2de0c023b5cc87035a6f26ee25734a35a490345dbf')
21 25 
validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
22 26 
              '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P.
23 27 

  		




  24
  
  
    
pkgrel=1

  		




  
  28
  
    
pkgrel=2

  		




  25
  29
  
    
pkgrel+=.nonsystemd2

  		




  26
  30
  
    

  		




  27
  31
  
    
arch=('any')

  		




  ......




  39
  43
  
    
  cd "$srcdir/$pkgbase-$pkgver-nonsystemd"

  		




  40
  44
  
    
  patch -N -p1 -i $srcdir/revert.patch

  		




  41
  45
  
    
  patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch

  		




  
  46
  
    
  patch -N -p1 -i $srcdir/no-pacstrap-d.patch

  		




  
  47
  
    
  patch -N -p1 -i $srcdir/disable-ronn.patch

  		




  42
  48
  
    
}

  		




  43
  49
  
    

  		




  44
  50
  
    
build() {

  		












  

    
      nonsystemd/libretools/disable-ronn.patch
    
  





  
  1
  
    
Index: libretools-20220118/build-aux/Makefile.each.tail/20-libretools.mk

  		




  
  2
  
    
===================================================================

  		




  
  3
  
    
--- libretools-20220118.orig/build-aux/Makefile.each.tail/20-libretools.mk

  		




  
  4
  
    
+++ libretools-20220118/build-aux/Makefile.each.tail/20-libretools.mk

  		




  
  5
  
    
@@ -55,9 +55,9 @@ _is_executable = $(filter $(libretools.o

  		




  
  6
  
    
 $(outdir)/%: $(srcdir)/%.in

  		




  
  7
  
    
 	@echo 'EDIT < $< > $@'; $(libretools.edit) < '$<' | install -T -m$(if $(_is_executable),755,644) /dev/stdin '$@'

  		




  
  8
  
    
 $(outdir)/%: $(srcdir)/%.ronn

  		




  
  9
  
    
-	ronn --roff $(RONNFLAGS) < '$<' > '$@'

  		




  
  10
  
    
+	@echo "SKIP ronn --roff $(RONNFLAGS) < '$<' > '$@'"

  		




  
  11
  
    
 $(outdir)/%.html: $(srcdir)/%.ronn

  		




  
  12
  
    
-	ronn --html $(RONNFLAGS) < '$<' > '$@'

  		




  
  13
  
    
+	@echo "SKIP ronn --html $(RONNFLAGS) < '$<' > '$@'"

  		




  
  14
  
    
 $(srcdir)/%.pot: $(srcdir)/% $(topsrcdir)/src/lib/librexgettext

  		




  
  15
  
    
 	cd $(<D) && $(abspath $(topsrcdir)/src/lib/librexgettext) $(LIBREXGETTEXT_FLAGS) $(<F) > $(@F)

  		




  
  16
  
    
 $(srcdir)/dir.pot: $(addprefix $(outdir)/,$(addsuffix .pot,$(libretools.pots)))

  		




  
  17
  
    
Index: libretools-20220118/build-aux/Makefile.once.head/00-libretools.mk

  		




  
  18
  
    
===================================================================

  		




  
  19
  
    
--- libretools-20220118.orig/build-aux/Makefile.once.head/00-libretools.mk

  		




  
  20
  
    
+++ libretools-20220118/build-aux/Makefile.once.head/00-libretools.mk

  		




  
  21
  
    
@@ -43,7 +43,6 @@ define mod.libretools.doc

  		




  
  22
  
    
 #     - Directory variable : `libretools.src`

  		




  
  23
  
    
 #     - Directory variable : `libretools.src.exec`

  		




  
  24
  
    
 #     - Directory variable : `libretools.src.conf`

  		




  
  25
  
    
-#     - Directory variable : `libretools.src.ronn`

  		




  
  26
  
    
 #     - Directory variable : `libretools.src.md`

  		




  
  27
  
    
 #     - Directory variable : `libretools.src.sh`

  		




  
  28
  
    
 #     - File               : `$(topsrcdir)/.srcversion-libretools.mk`

  		




  
  29
  
    
@@ -62,8 +61,6 @@ define mod.libretools.doc

  		




  
  30
  
    
 #     - Directory variable : `files.out.int`

  		




  
  31
  
    
 #     - Target             : `$(srcdir)/%.in: $(devtoolsdir)/%.in`

  		




  
  32
  
    
 #     - Target             : `$(outdir)/%: $(srcdir)/%.in`

  		




  
  33
  
    
-#     - Target             : `$(outdir)/%     : $(srcdir)/%.ronn`

  		




  
  34
  
    
-#     - Target             : `$(outdir)/%.html: $(srcdir)/%.ronn`

  		




  
  35
  
    
 #     - Target             : `$(outdir)/%.pot: $(outdir)/%`

  		




  
  36
  
    
 #     - Target             : `$(outdir)/%.pot: $(srcdir)/%`

  		




  
  37
  
    
 #     - Target             : `$(srcdir)/dir.pot`

  		




  
  38
  
    
@@ -110,8 +107,6 @@ libretools.src.git  = $(files.src.src)

  		




  
  39
  
    
 libretools.src.exec = $(patsubst $(srcdir)/%,%,$(shell find $(addprefix $(srcdir)/,$(libretools.src.git)) -maxdepth 0 -executable -type f 2>/dev/null))

  		




  
  40
  
    
 libretools.src.conf = $(filter %.conf,$(libretools.src.git))

  		




  
  41
  
    
 libretools.src.sh   = $(filter %.sh  ,$(libretools.src.git))

  		




  
  42
  
    
-libretools.src.ronn = $(filter %.ronn,$(libretools.src.git))

  		




  
  43
  
    
-libretools.src.md   = $(filter-out HACKING.md,$(filter %.ronn %.md,$(libretools.src.git)))

  		




  
  44
  
    
 

  		




  
  45
  
    
 LIBREXGETTEXT_FLAGS ?=

  		




  
  46
  
    
 

  		












  

    
      nonsystemd/libretools/no-pacstrap-d.patch
    
  





  
  1
  
    
Index: libretools-20220118/src/chroot-tools/mkarchroot.in

  		




  
  2
  
    
===================================================================

  		




  
  3
  
    
--- libretools-20220118.orig/src/chroot-tools/mkarchroot.in

  		




  
  4
  
    
+++ libretools-20220118/src/chroot-tools/mkarchroot.in

  		




  
  5
  
    
@@ -83,7 +83,7 @@ while read -r varname; do

  		




  
  6
  
    
 	_env+=("$varname=${!varname}")

  		




  
  7
  
    
 done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')

  		




  
  8
  
    
 env -i "${_env[@]}" \

  		




  
  9
  
    
-pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \

  		




  
  10
  
    
+pacstrap -GMc ${pac_conf:+-C "$pac_conf"} "$working_dir" \

  		




  
  11
  
    
   "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'

  		




  
  12
  
    
 

  		




  
  13
  
    
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"

  		




  0
  
  
    
- 

  		















  
    (1-1/1)