[packages/librepo] - rediff patches

baggins baggins at pld-linux.org
Fri Mar 5 22:45:21 CET 2021


commit 40cb1094ef2561c22833b7d4150cc913b5ffebde
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 5 22:45:09 2021 +0100

    - rediff patches

 librepo-attr.patch      | 36 ++++++++++++++++++++----------------
 librepo-link.patch      |  9 +++++----
 sphinx_executable.patch |  6 +++---
 3 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/librepo-attr.patch b/librepo-attr.patch
index 2c16753..805e6f4 100644
--- a/librepo-attr.patch
+++ b/librepo-attr.patch
@@ -1,5 +1,17 @@
---- librepo-1.8.1/librepo/checksum.c.orig	2017-09-01 17:45:17.000000000 +0200
-+++ librepo-1.8.1/librepo/checksum.c	2017-11-19 08:09:39.084533788 +0100
+diff -urNp -x '*.orig' librepo-1.8.1.org/CMakeLists.txt librepo-1.8.1/CMakeLists.txt
+--- librepo-1.8.1.org/CMakeLists.txt	2017-09-01 17:45:17.000000000 +0200
++++ librepo-1.8.1/CMakeLists.txt	2021-03-05 22:44:35.111104671 +0100
+@@ -32,7 +32,6 @@ PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED lib
+ FIND_PACKAGE(EXPAT REQUIRED)
+ FIND_PACKAGE(CURL REQUIRED)
+ FIND_PACKAGE(Gpgme REQUIRED)
+-FIND_PACKAGE(Xattr REQUIRED)
+ 
+ INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
+ 
+diff -urNp -x '*.orig' librepo-1.8.1.org/librepo/checksum.c librepo-1.8.1/librepo/checksum.c
+--- librepo-1.8.1.org/librepo/checksum.c	2017-09-01 17:45:17.000000000 +0200
++++ librepo-1.8.1/librepo/checksum.c	2021-03-05 22:44:35.111104671 +0100
 @@ -26,7 +26,8 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -10,8 +22,9 @@
  #include <openssl/evp.h>
  
  #include "cleanup.h"
---- librepo-1.8.1/librepo/downloader.c.orig	2017-09-01 17:45:17.000000000 +0200
-+++ librepo-1.8.1/librepo/downloader.c	2017-11-19 08:11:38.764532423 +0100
+diff -urNp -x '*.orig' librepo-1.8.1.org/librepo/downloader.c librepo-1.8.1/librepo/downloader.c
+--- librepo-1.8.1.org/librepo/downloader.c	2017-09-01 17:45:17.000000000 +0200
++++ librepo-1.8.1/librepo/downloader.c	2021-03-05 22:44:35.111104671 +0100
 @@ -30,7 +30,7 @@
  #include <sys/stat.h>
  #include <fcntl.h>
@@ -21,8 +34,9 @@
  
  #include "downloader.h"
  #include "downloader_internal.h"
---- librepo-1.8.1/tests/test_checksum.c.orig	2017-09-01 17:45:17.000000000 +0200
-+++ librepo-1.8.1/tests/test_checksum.c	2017-11-19 08:12:19.011198628 +0100
+diff -urNp -x '*.orig' librepo-1.8.1.org/tests/test_checksum.c librepo-1.8.1/tests/test_checksum.c
+--- librepo-1.8.1.org/tests/test_checksum.c	2017-09-01 17:45:17.000000000 +0200
++++ librepo-1.8.1/tests/test_checksum.c	2021-03-05 22:44:35.111104671 +0100
 @@ -6,7 +6,8 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -33,13 +47,3 @@
  
  #include "librepo/util.h"
  #include "librepo/checksum.h"
---- librepo-1.8.1/CMakeLists.txt.orig	2017-09-01 17:45:17.000000000 +0200
-+++ librepo-1.8.1/CMakeLists.txt	2017-11-19 08:12:38.604531738 +0100
-@@ -32,7 +32,6 @@
- FIND_PACKAGE(EXPAT REQUIRED)
- FIND_PACKAGE(CURL REQUIRED)
- FIND_PACKAGE(Gpgme REQUIRED)
--FIND_PACKAGE(Xattr REQUIRED)
- 
- INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
- 
diff --git a/librepo-link.patch b/librepo-link.patch
index 8a02d5e..23ed2af 100644
--- a/librepo-link.patch
+++ b/librepo-link.patch
@@ -1,7 +1,8 @@
---- librepo/librepo/CMakeLists.txt.orig	2014-01-01 16:06:43.000000000 +0100
-+++ librepo/librepo/CMakeLists.txt	2014-01-01 16:42:18.009091593 +0100
-@@ -46,6 +46,7 @@
-                         ${CURL_LIBRARY}
+diff -urNp -x '*.orig' librepo-1.8.1.org/librepo/CMakeLists.txt librepo-1.8.1/librepo/CMakeLists.txt
+--- librepo-1.8.1.org/librepo/CMakeLists.txt	2017-09-01 17:45:17.000000000 +0200
++++ librepo-1.8.1/librepo/CMakeLists.txt	2021-03-05 22:44:35.021105057 +0100
+@@ -52,6 +52,7 @@ TARGET_LINK_LIBRARIES(librepo
+                         ${LIBCRYPTO_LIBRARIES}
                          ${GPGME_VANILLA_LIBRARIES}
                          ${GLIB2_LIBRARIES}
 +			crypto
diff --git a/sphinx_executable.patch b/sphinx_executable.patch
index 803cea3..fd111fc 100644
--- a/sphinx_executable.patch
+++ b/sphinx_executable.patch
@@ -1,6 +1,6 @@
-diff -dur librepo-librepo-1.7.13.orig/doc/python/CMakeLists.txt librepo-librepo-1.7.13/doc/python/CMakeLists.txt
---- librepo-librepo-1.7.13.orig/doc/python/CMakeLists.txt	2015-01-23 15:43:51.000000000 +0100
-+++ librepo-librepo-1.7.13/doc/python/CMakeLists.txt	2015-11-30 18:48:12.275656366 +0100
+diff -urNp -x '*.orig' librepo-1.8.1.org/doc/python/CMakeLists.txt librepo-1.8.1/doc/python/CMakeLists.txt
+--- librepo-1.8.1.org/doc/python/CMakeLists.txt	2017-09-01 17:45:17.000000000 +0200
++++ librepo-1.8.1/doc/python/CMakeLists.txt	2021-03-05 22:44:35.207770924 +0100
 @@ -1,5 +1,5 @@
  ADD_CUSTOM_TARGET (doc-python
 -    PYTHONPATH=${CMAKE_BINARY_DIR}/librepo/python/python${PYTHON_DESIRED} sphinx-build -E -b html
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/librepo.git/commitdiff/40cb1094ef2561c22833b7d4150cc913b5ffebde



More information about the pld-cvs-commit mailing list