From 48aebe207bed4d1b27060e27e9ebaae9c0caa8ca Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 26 Dec 2017 21:44:32 +0100 Subject: [PATCH] update nodate, outdir, nointernalapi patches --- jack-apidoc-only.patch | 27 ------------------- ...-audio-connection-kit-no_date_footer.patch | 22 --------------- jack-audio-connection-kit.spec | 7 ++--- jack2-1.9.12-nodate.patch | 22 +++++++++++++++ jack2-1.9.12-nointernalapi.patch | 27 +++++++++++++++++++ ...dir-fix.patch => jack2-1.9.12-outdir.patch | 10 +++---- 6 files changed, 58 insertions(+), 57 deletions(-) delete mode 100644 jack-apidoc-only.patch delete mode 100644 jack-audio-connection-kit-no_date_footer.patch create mode 100644 jack2-1.9.12-nodate.patch create mode 100644 jack2-1.9.12-nointernalapi.patch rename jack-doxygen-output-dir-fix.patch => jack2-1.9.12-outdir.patch (53%) diff --git a/jack-apidoc-only.patch b/jack-apidoc-only.patch deleted file mode 100644 index e0eb2ac..0000000 --- a/jack-apidoc-only.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rupN jack-1.9.8.old/doxyfile jack-1.9.8/doxyfile ---- jack-1.9.8.old/doxyfile 2011-12-19 06:53:48.000000000 -0500 -+++ jack-1.9.8/doxyfile 2011-12-24 14:04:23.569998760 -0500 -@@ -574,22 +574,7 @@ WARN_LOGFILE = - # directories like "/usr/src/myproject". Separate the files or directories - # with spaces. - --INPUT = common \ -- posix \ -- macosx \ -- macosx/coreaudio/ \ -- macosx/coremidi/ \ -- linux \ -- linux/alsa \ -- linux/alsarawmidi \ -- linux/firewire \ -- linux/freebob \ -- windows \ -- windows/portaudio \ -- windows/winmme \ -- solaris \ -- solaris/oss \ -- common/jack/ -+INPUT = common/jack/ - - # This tag can be used to specify the character encoding of the source files - # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/jack-audio-connection-kit-no_date_footer.patch b/jack-audio-connection-kit-no_date_footer.patch deleted file mode 100644 index c931b9a..0000000 --- a/jack-audio-connection-kit-no_date_footer.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile ---- jack-1.9.7.old/doxyfile 2011-03-30 11:03:54.000000000 -0400 -+++ jack-1.9.7/doxyfile 2011-04-02 23:03:35.000000000 -0400 -@@ -800,7 +800,7 @@ HTML_HEADER = - # each generated HTML page. If it is left blank doxygen will generate a - # standard footer. - --HTML_FOOTER = -+HTML_FOOTER = no_date_footer.html - - # The HTML_STYLESHEET tag can be used to specify a user-defined cascading - # style sheet that is used by each HTML page. It can be used to -diff -rupN jack-1.9.7.old/no_date_footer.html jack-1.9.7/no_date_footer.html ---- jack-1.9.7.old/no_date_footer.html 1969-12-31 19:00:00.000000000 -0500 -+++ jack-1.9.7/no_date_footer.html 2011-04-02 22:53:49.000000000 -0400 -@@ -0,0 +1,6 @@ -+
-+Generated for $projectname by doxygen -+$doxygenversion
-+ -+ diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec index 0f138c8..fd144f0 100644 --- a/jack-audio-connection-kit.spec +++ b/jack-audio-connection-kit.spec @@ -21,11 +21,11 @@ Source1: %{name}-README.Fedora Source2: %{name}-script.pa Source3: %{name}-limits.conf # No-date-footer hack to remove dates from doxygen documentation -Patch0: jack-audio-connection-kit-no_date_footer.patch +Patch0: jack2-1.9.12-nodate.patch # Build fix -Patch1: jack-doxygen-output-dir-fix.patch +Patch1: jack2-1.9.12-outdir.patch # We don't want the internal API documentation -Patch2: jack-apidoc-only.patch +Patch2: jack2-1.9.12-nointernalapi.patch # Adjust default priority. RHBZ#795094 Patch3: jack-realtime-compat.patch # Enable renaming and reordering the jack ports RHBZ#887408 @@ -268,6 +268,7 @@ exit 0 * Tue Dec 26 2017 Nils Philippsen - 1.9.12-1 - version 1.9.12 - update source URL +- update nodate, outdir, nointernalapi patches * Wed Aug 02 2017 Fedora Release Engineering - 1.9.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/jack2-1.9.12-nodate.patch b/jack2-1.9.12-nodate.patch new file mode 100644 index 0000000..1fe0e91 --- /dev/null +++ b/jack2-1.9.12-nodate.patch @@ -0,0 +1,22 @@ +diff -up jack2-1.9.12/doxyfile.in.nodate jack2-1.9.12/doxyfile.in +--- jack2-1.9.12/doxyfile.in.nodate 2017-12-13 22:19:04.000000000 +0100 ++++ jack2-1.9.12/doxyfile.in 2017-12-26 18:15:27.130315688 +0100 +@@ -807,7 +807,7 @@ HTML_HEADER = + # each generated HTML page. If it is left blank doxygen will generate a + # standard footer. + +-HTML_FOOTER = ++HTML_FOOTER = @SRCDIR@/no_date_footer.html + + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading + # style sheet that is used by each HTML page. It can be used to +diff -up jack2-1.9.12/no_date_footer.html.nodate jack2-1.9.12/no_date_footer.html +--- jack2-1.9.12/no_date_footer.html.nodate 2017-12-26 18:12:48.975963873 +0100 ++++ jack2-1.9.12/no_date_footer.html 2017-12-26 18:12:48.975963873 +0100 +@@ -0,0 +1,6 @@ ++
++Generated for $projectname by doxygen ++$doxygenversion
++ ++ diff --git a/jack2-1.9.12-nointernalapi.patch b/jack2-1.9.12-nointernalapi.patch new file mode 100644 index 0000000..ee73b94 --- /dev/null +++ b/jack2-1.9.12-nointernalapi.patch @@ -0,0 +1,27 @@ +diff -up jack2-1.9.12/doxyfile.in.nointernalapi jack2-1.9.12/doxyfile.in +--- jack2-1.9.12/doxyfile.in.nointernalapi 2017-12-26 17:43:14.387643693 +0100 ++++ jack2-1.9.12/doxyfile.in 2017-12-26 17:44:34.743795861 +0100 +@@ -574,22 +574,7 @@ WARN_LOGFILE = + # directories like "/usr/src/myproject". Separate the files or directories + # with spaces. + +-INPUT = @SRCDIR@/common \ +- @SRCDIR@/posix \ +- @SRCDIR@/macosx \ +- @SRCDIR@/macosx/coreaudio/ \ +- @SRCDIR@/macosx/coremidi/ \ +- @SRCDIR@/linux \ +- @SRCDIR@/linux/alsa \ +- @SRCDIR@/linux/alsarawmidi \ +- @SRCDIR@/linux/firewire \ +- @SRCDIR@/linux/freebob \ +- @SRCDIR@/windows \ +- @SRCDIR@/windows/portaudio \ +- @SRCDIR@/windows/winmme \ +- @SRCDIR@/solaris \ +- @SRCDIR@/solaris/oss \ +- @SRCDIR@/common/jack/ ++INPUT = @SRCDIR@/common/jack/ + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/jack-doxygen-output-dir-fix.patch b/jack2-1.9.12-outdir.patch similarity index 53% rename from jack-doxygen-output-dir-fix.patch rename to jack2-1.9.12-outdir.patch index 8a93900..b6bd8da 100644 --- a/jack-doxygen-output-dir-fix.patch +++ b/jack2-1.9.12-outdir.patch @@ -1,12 +1,12 @@ -diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile ---- jack-1.9.7.old/doxyfile 2011-03-30 11:03:54.000000000 -0400 -+++ jack-1.9.7/doxyfile 2011-04-03 08:54:03.000000000 -0400 -@@ -38,7 +38,7 @@ PROJECT_NUMBER = 1.9.7 +diff -up jack2-1.9.12/doxyfile.in.outdir jack2-1.9.12/doxyfile.in +--- jack2-1.9.12/doxyfile.in.outdir 2017-12-26 17:41:13.121923158 +0100 ++++ jack2-1.9.12/doxyfile.in 2017-12-26 17:41:29.048755116 +0100 +@@ -38,7 +38,7 @@ PROJECT_NUMBER = @VERSION@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = -+OUTPUT_DIRECTORY = build/default/ ++OUTPUT_DIRECTORY = default/ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output