summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0060-cross.patch4
-rw-r--r--debian/patches/0100-source_spelling.patch38
-rw-r--r--debian/patches/0705-kfreebsd.patch2
-rw-r--r--debian/patches/series8
4 files changed, 26 insertions, 26 deletions
diff --git a/debian/patches/0060-cross.patch b/debian/patches/0060-cross.patch
index a810929..1c32cac 100644
--- a/debian/patches/0060-cross.patch
+++ b/debian/patches/0060-cross.patch
@@ -9,7 +9,7 @@ Index: trunk/acinclude.m4
===================================================================
--- trunk.orig/acinclude.m4
+++ trunk/acinclude.m4
-@@ -436,15 +436,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
+@@ -414,15 +414,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
# a program. And, if that works, then add the -l flags to
# GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
# sane-config.
@@ -36,7 +36,7 @@ Index: trunk/acinclude.m4
saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${GPHOTO2_CPPFLAGS}"
saved_LIBS="${LIBS}"
-@@ -464,13 +468,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
+@@ -442,13 +446,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
GPHOTO2_LIBS=""
else
SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS)
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 6bf41f1..b91aa72 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -21,7 +21,7 @@ Index: trunk/frontend/jpegtopdf.c
===================================================================
--- trunk.orig/frontend/jpegtopdf.c
+++ trunk/frontend/jpegtopdf.c
-@@ -285,7 +285,7 @@ SANE_Int sane_pdf_start_doc( void *pw )
+@@ -289,7 +289,7 @@ SANE_Int sane_pdf_start_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -30,7 +30,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -326,7 +326,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -330,7 +330,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -39,7 +39,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -346,7 +346,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -350,7 +350,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -48,7 +48,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -360,7 +360,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -364,7 +364,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -57,7 +57,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -376,7 +376,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -380,7 +380,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -66,7 +66,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -386,7 +386,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -390,7 +390,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( _get_current_time( &tm, &sign_c, &tz_h, &tz_m ) == SANE_ERR ) {
@@ -75,7 +75,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
/* Dates format */
-@@ -404,7 +404,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -408,7 +408,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -84,7 +84,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -420,7 +420,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -424,7 +424,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -93,7 +93,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -434,7 +434,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -438,7 +438,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -102,7 +102,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
w_count += SANE_PDF_FIRST_PAGE_ID - 1;
-@@ -450,7 +450,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -454,7 +454,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -111,7 +111,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
w_count ++;
-@@ -472,7 +472,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+@@ -476,7 +476,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -120,7 +120,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -568,7 +568,7 @@ SANE_Int sane_pdf_start_page(
+@@ -572,7 +572,7 @@ SANE_Int sane_pdf_start_page(
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -129,7 +129,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -586,7 +586,7 @@ SANE_Int sane_pdf_start_page(
+@@ -590,7 +590,7 @@ SANE_Int sane_pdf_start_page(
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -138,7 +138,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
/* write Contents(2) */
-@@ -598,7 +598,7 @@ SANE_Int sane_pdf_start_page(
+@@ -602,7 +602,7 @@ SANE_Int sane_pdf_start_page(
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -147,7 +147,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -609,7 +609,7 @@ SANE_Int sane_pdf_start_page(
+@@ -613,7 +613,7 @@ SANE_Int sane_pdf_start_page(
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -156,7 +156,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -627,7 +627,7 @@ SANE_Int sane_pdf_start_page(
+@@ -631,7 +631,7 @@ SANE_Int sane_pdf_start_page(
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -165,7 +165,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -648,7 +648,7 @@ SANE_Int sane_pdf_start_page(
+@@ -652,7 +652,7 @@ SANE_Int sane_pdf_start_page(
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -174,7 +174,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -680,7 +680,7 @@ SANE_Int sane_pdf_end_page( void *pw )
+@@ -684,7 +684,7 @@ SANE_Int sane_pdf_end_page( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
@@ -183,7 +183,7 @@ Index: trunk/frontend/jpegtopdf.c
goto EXIT;
}
-@@ -698,7 +698,7 @@ SANE_Int sane_pdf_end_page( void *pw )
+@@ -702,7 +702,7 @@ SANE_Int sane_pdf_end_page( void *pw )
goto EXIT;
}
if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
diff --git a/debian/patches/0705-kfreebsd.patch b/debian/patches/0705-kfreebsd.patch
index 34a510b..c46c44d 100644
--- a/debian/patches/0705-kfreebsd.patch
+++ b/debian/patches/0705-kfreebsd.patch
@@ -4,7 +4,7 @@ Index: trunk/backend/umax_pp_low.c
===================================================================
--- trunk.orig/backend/umax_pp_low.c
+++ trunk/backend/umax_pp_low.c
-@@ -72,8 +72,10 @@
+@@ -70,8 +70,10 @@
#endif
#ifdef HAVE_MACHINE_CPUFUNC_H
diff --git a/debian/patches/series b/debian/patches/series
index d52a695..f829f7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
#0011-test.patch
-0195-genesys_fix_total_file_size_exceeding.patch
-0035-trim-libraries-in-sane-backends.pc.in.patch
+#0195-genesys_fix_total_file_size_exceeding.patch
+#0035-trim-libraries-in-sane-backends.pc.in.patch
0040-remove_git.patch
0100-source_spelling.patch
0125-multiarch_dll_search_path.patch
@@ -12,7 +12,7 @@
0725-fix_link_60-libsane_rule.patch
0150-i386-test.patch
0155-hurd_PATH_MAX.patch
-0045-disable_lock_test_at_build_time.patch
+#0045-disable_lock_test_at_build_time.patch
0050-Use-python3-shebang.patch
#0055-Fix_build_error.patch
0060-cross.patch
@@ -20,6 +20,6 @@
#0170-return_empty_list_when_local_devices_requested.patch
0605-fix_groff-warnings.patch
#0180-gt68xx_fix_use-after-free_two_memleaks.patch
-0185-Change_output_from_sane-find-scanner.patch
+#0185-Change_output_from_sane-find-scanner.patch
#0190-remove-kernel-driver-for-plustek_pp.patch
0200-disable-check-equal-stderr.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:28:52 +0000