public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/
@ 2016-01-16 22:32 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-01-16 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     a83b995af94c08b4d06c7770d1e312dc502cbed7
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Jan 15 09:46:24 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:46:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83b995a

app-text/zathura: add synctex patch for 9999

 app-text/zathura/files/zathura-9999-synctex.patch | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/app-text/zathura/files/zathura-9999-synctex.patch b/app-text/zathura/files/zathura-9999-synctex.patch
new file mode 100644
index 0000000..1a8a492
--- /dev/null
+++ b/app-text/zathura/files/zathura-9999-synctex.patch
@@ -0,0 +1,51 @@
+From f0a86c6ef7c43eec07b0ddc7c002dba506ca1e26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
+Date: Sat, 9 Jan 2016 09:48:53 +0100
+Subject: [PATCH] Use synctex_editor only if WITH_SYNCTEX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without installed synctex, the build fails like:
+
+zathura/main.c: In function ‘main’:
+zathura/main.c:254:26: error: ‘synctex_editor’ undeclared (first use in this function)
+       plugin_path, argv, synctex_editor, embed);
+                          ^
+zathura/main.c:254:26: note: each undeclared identifier is reported only once for each function it appears in
+Makefile:103: recipe for target 'build/release/zathura/main.o' failed
+
+This patch fixes it.
+
+<https://bugs.gentoo.org/show_bug.cgi?id=571346>
+---
+ zathura/main.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/zathura/main.c b/zathura/main.c
+index 060382a..9c0d0d3 100644
+--- a/zathura/main.c
++++ b/zathura/main.c
+@@ -250,11 +250,16 @@ main(int argc, char* argv[])
+ 
+   /* Create zathura session */
+   zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir,
+-#ifdef GDK_WINDOWING_X11
+-      plugin_path, argv, synctex_editor, embed);
++      plugin_path, argv,
++#ifdef WITH_SYNCTEX
++      synctex_editor
+ #else
+-      plugin_path, argv, synctex_editor);
++      NULL
++#endif
++#ifdef GDK_WINDOWING_X11
++      , embed
+ #endif
++  );
+   if (zathura == NULL) {
+     girara_error("Could not initialize zathura.");
+     return -1;
+-- 
+2.4.10
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/
@ 2016-07-17 13:33 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-07-17 13:33 UTC (permalink / raw
  To: gentoo-commits

commit:     cf02defe32d75dfb9455a7fb4943a43c61f9bbcf
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 17 08:38:53 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 13:33:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf02defe

app-text/zathura: remove unused patches

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../zathura/files/zathura-0.3.2-no-sqlite.patch    | 11 -----
 app-text/zathura/files/zathura-0.3.4-synctex.patch | 51 ----------------------
 2 files changed, 62 deletions(-)

diff --git a/app-text/zathura/files/zathura-0.3.2-no-sqlite.patch b/app-text/zathura/files/zathura-0.3.2-no-sqlite.patch
deleted file mode 100644
index 3a93db8..0000000
--- a/app-text/zathura/files/zathura-0.3.2-no-sqlite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zathura-0.3.2/Makefile
-+++ zathura-0.3.2/Makefile
-@@ -12,7 +12,7 @@
- SOURCE    = $(OSOURCE)
- CPPFLAGS += -DWITH_SQLITE
- else
--SOURCE    = $(filter-out database-sqlite.c,$(OSOURCE))
-+SOURCE    = $(filter-out ${PROJECT}/database-sqlite.c,$(OSOURCE))
- endif
- 
- ifneq ($(WITH_MAGIC),0)

diff --git a/app-text/zathura/files/zathura-0.3.4-synctex.patch b/app-text/zathura/files/zathura-0.3.4-synctex.patch
deleted file mode 100644
index 1a8a492..0000000
--- a/app-text/zathura/files/zathura-0.3.4-synctex.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f0a86c6ef7c43eec07b0ddc7c002dba506ca1e26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
-Date: Sat, 9 Jan 2016 09:48:53 +0100
-Subject: [PATCH] Use synctex_editor only if WITH_SYNCTEX
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without installed synctex, the build fails like:
-
-zathura/main.c: In function ‘main’:
-zathura/main.c:254:26: error: ‘synctex_editor’ undeclared (first use in this function)
-       plugin_path, argv, synctex_editor, embed);
-                          ^
-zathura/main.c:254:26: note: each undeclared identifier is reported only once for each function it appears in
-Makefile:103: recipe for target 'build/release/zathura/main.o' failed
-
-This patch fixes it.
-
-<https://bugs.gentoo.org/show_bug.cgi?id=571346>
----
- zathura/main.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/zathura/main.c b/zathura/main.c
-index 060382a..9c0d0d3 100644
---- a/zathura/main.c
-+++ b/zathura/main.c
-@@ -250,11 +250,16 @@ main(int argc, char* argv[])
- 
-   /* Create zathura session */
-   zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir,
--#ifdef GDK_WINDOWING_X11
--      plugin_path, argv, synctex_editor, embed);
-+      plugin_path, argv,
-+#ifdef WITH_SYNCTEX
-+      synctex_editor
- #else
--      plugin_path, argv, synctex_editor);
-+      NULL
-+#endif
-+#ifdef GDK_WINDOWING_X11
-+      , embed
- #endif
-+  );
-   if (zathura == NULL) {
-     girara_error("Could not initialize zathura.");
-     return -1;
--- 
-2.4.10
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/
@ 2022-10-23 20:37 Conrad Kostecki
  0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2022-10-23 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9dfb85f243fbfef42ed350a7fe891e1edd99757f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Oct 19 17:03:20 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 20:34:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfb85f2

app-text/zathura: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27853
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/zathura-0.4.8-meson-0.61-build.patch     | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
deleted file mode 100644
index 577eddc4da1f..000000000000
--- a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656.patch
-https://bugs.gentoo.org/831468
-
-From: Sebastian Ramacher <sebastian@ramacher.at>
-Date: Sat, 30 Oct 2021 15:41:25 +0200
-Subject: [PATCH] Fix build with meson 0.60
-
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,7 @@ endif
- i18n = import('i18n')
- podir = join_paths(meson.project_source_root(), 'po')
- 
--desktop = i18n.merge_file('desktop',
-+desktop = i18n.merge_file(
-   input: 'org.pwmt.zathura.desktop.in',
-   output: 'org.pwmt.zathura.desktop',
-   install: true,
-@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop',
-   type: 'desktop'
- )
- 
--appdata = i18n.merge_file('appdata',
-+appdata = i18n.merge_file(
-   input: 'org.pwmt.zathura.appdata.xml.in',
-   output: 'org.pwmt.zathura.appdata.xml',
-   install: true,


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/
@ 2024-10-27  7:10 Joonas Niilola
  0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-10-27  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     99f6054de1bfe6d4a96d55175cd911e0d23757a0
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 26 14:05:10 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 07:10:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f6054d

app-text/zathura: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/zathura-9999-disable-seccomp-tests.patch | 22 ----------------------
 .../files/zathura-disable-seccomp-tests.patch      | 22 ----------------------
 2 files changed, 44 deletions(-)

diff --git a/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
deleted file mode 100644
index 09947eb722b4..000000000000
--- a/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/meson.build b/tests/meson.build
-index 10531a5..1c79e29 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -54,17 +54,5 @@ if check.found()
-       args: xvfb_args + [session],
-       timeout: 60*60
-     )
--
--    if seccomp.found()
--      sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
--        dependencies: build_dependencies + test_dependencies,
--        include_directories: include_directories,
--        c_args: defines + flags
--      )
--      test('sandbox', xvfb,
--        args: xvfb_args + [sandbox],
--        timeout: 60*60
--      )
--    endif
-   endif
- endif

diff --git a/app-text/zathura/files/zathura-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-disable-seccomp-tests.patch
deleted file mode 100644
index f3d88a2746d2..000000000000
--- a/app-text/zathura/files/zathura-disable-seccomp-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/meson.build b/tests/meson.build
-index ac7edb8..68216f3 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -25,17 +25,6 @@ if check.found()
-     timeout: 60*60
-   )
- 
--  if seccomp.found()
--    sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
--      dependencies: build_dependencies + test_dependencies,
--      include_directories: include_directories,
--      c_args: defines + flags
--    )
--    test('sandbox', sandbox,
--      timeout: 60*60
--    )
--  endif
--
-   utils = executable('test_utils', ['test_utils.c', 'tests.c'],
-     dependencies: build_dependencies + test_dependencies,
-     include_directories: include_directories,


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-10-27  7:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-23 20:37 [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-10-27  7:10 Joonas Niilola
2016-07-17 13:33 Patrice Clement
2016-01-16 22:32 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox