rpms
/
devhelp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8s
Branches Tags
rpms:c8s
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:imports/c9/devhelp-40.1-1.el9
rpms:imports/c9-beta/devhelp-40.1-1.el9
rpms:imports/c9-beta/devhelp-40.0-3.el9
rpms:imports/c8-beta/devhelp-3.28.1-5.el8
rpms:imports/c8/devhelp-3.28.1-5.el8
rpms:imports/c8s/devhelp-3.28.1-5.el8
...
pull from: rpms:c9-beta
Branches Tags
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:c8s
rpms:imports/c9/devhelp-40.1-1.el9
rpms:imports/c9-beta/devhelp-40.1-1.el9
rpms:imports/c9-beta/devhelp-40.0-3.el9
rpms:imports/c8-beta/devhelp-3.28.1-5.el8
rpms:imports/c8/devhelp-3.28.1-5.el8
rpms:imports/c8s/devhelp-3.28.1-5.el8

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

5 changed files with 2144 additions and 160 deletions
Show Stats Expand all files Collapse all files

2
.devhelp.metadata
View File

@ -1 +1 @@
06dfa91aaef426d3d9d6f410bbe5f1c3e442dd20 SOURCES/devhelp-3.28.1.tar.xz
7c82a922823cc6c16fd19221cc0eb5b8e222af54 SOURCES/devhelp-40.1.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/devhelp-3.28.1.tar.xz
SOURCES/devhelp-40.1.tar.xz

2032
SOURCES/0001-Revert-Revert-Revert-the-introduction-of-the-amtk-li.patch Normal file
View File

File diff suppressed because it is too large Load Diff

108
SOURCES/covscan.patch
View File

@ -1,108 +0,0 @@
diff --git a/src/dh-book-tree.c b/src/dh-book-tree.c
index e97fe283..7d8f2395 100644
--- a/src/dh-book-tree.c
+++ b/src/dh-book-tree.c
@@ -177,7 +177,7 @@ book_tree_find_language_group (DhBookTree *tree,
g_return_if_reached ();
}
- if (exact_iter != NULL &&
+ if (exact_iter != NULL && exact_found &&
g_ascii_strcasecmp (title, language) == 0) {
/* Exact match found! */
*exact_iter = loop_iter;
@@ -187,7 +187,7 @@ book_tree_find_language_group (DhBookTree *tree,
g_free (title);
return;
}
- } else if (next_iter != NULL &&
+ } else if (next_iter != NULL && next_found &&
g_ascii_strcasecmp (title, language) > 0) {
*next_iter = loop_iter;
*next_found = TRUE;
@@ -252,7 +252,7 @@ book_tree_find_book (DhBookTree *tree,
/* We can compare pointers directly as we're playing with references
* of the same object */
- if (exact_iter != NULL &&
+ if (exact_iter != NULL && exact_found &&
in_tree_book == book) {
*exact_iter = loop_iter;
*exact_found = TRUE;
diff --git a/src/dh-keyword-model.c b/src/dh-keyword-model.c
index a0b716f4..6a7fc50d 100644
--- a/src/dh-keyword-model.c
+++ b/src/dh-keyword-model.c
@@ -442,6 +442,14 @@ search_single_book (DhBook *book,
return ret;
}
+static gint
+compare_links (gconstpointer a,
+ gconstpointer b,
+ gpointer user_data)
+{
+ return dh_link_compare (a, b);
+}
+
static GQueue *
search_books (SearchSettings *settings,
guint max_hits,
@@ -486,7 +494,7 @@ search_books (SearchSettings *settings,
dh_util_queue_concat (ret, book_result);
}
- g_queue_sort (ret, (GCompareDataFunc) dh_link_compare, NULL);
+ g_queue_sort (ret, (GCompareDataFunc) compare_links, NULL);
return ret;
}
diff --git a/src/dh-preferences.c b/src/dh-preferences.c
index 0568c505..ffae33b3 100644
--- a/src/dh-preferences.c
+++ b/src/dh-preferences.c
@@ -143,7 +143,7 @@ preferences_bookshelf_find_book (DhPreferences *prefs,
-1);
/* We may have reached the start of the next language group here */
- if (first && !in_list_book) {
+ if (exact_found && first && !in_list_book) {
*next_iter = loop_iter;
*next_found = TRUE;
return;
@@ -151,7 +151,7 @@ preferences_bookshelf_find_book (DhPreferences *prefs,
/* We can compare pointers directly as we're playing with references
* of the same object */
- if (exact_iter &&
+ if (exact_iter && exact_found &&
in_list_book == book) {
*exact_iter = loop_iter;
*exact_found = TRUE;
@@ -160,7 +160,7 @@ preferences_bookshelf_find_book (DhPreferences *prefs,
g_object_unref (in_list_book);
return;
}
- } else if (next_iter &&
+ } else if (next_iter && next_found &&
dh_book_cmp_by_title (in_list_book, book) > 0) {
*next_iter = loop_iter;
*next_found = TRUE;
@@ -223,7 +223,7 @@ preferences_bookshelf_find_language_group (DhPreferences *prefs,
continue;
}
- if (exact_iter &&
+ if (exact_iter && exact_found &&
g_ascii_strcasecmp (title, language) == 0) {
/* Exact match found! */
*exact_iter = loop_iter;
@@ -233,7 +233,7 @@ preferences_bookshelf_find_language_group (DhPreferences *prefs,
g_free (title);
return;
}
- } else if (next_iter &&
+ } else if (next_iter && next_found &&
g_ascii_strcasecmp (title, language) > 0) {
*next_iter = loop_iter;
*next_found = TRUE;

160
SPECS/devhelp.spec
View File

@ -1,26 +1,31 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: devhelp
Epoch: 1
Version: 3.28.1
Release: 5%{?dist}
Version: 40.1
Release: 1%{?dist}
Summary: API documentation browser
License: GPLv2+ and LGPL2+
License: GPLv3+
URL: https://wiki.gnome.org/Apps/Devhelp
Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
Patch0: covscan.patch
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
BuildRequires: chrpath
BuildRequires: desktop-file-utils >= 0.3
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: itstool
BuildRequires: meson
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: libappstream-glib
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: devhelp-libs%{?_isa} = %{epoch}:%{version}-%{release}
# https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/21
Patch10001: 0001-Revert-Revert-Revert-the-introduction-of-the-amtk-li.patch
%description
Devhelp is an API documentation browser for the GNOME desktop.
@ -45,58 +50,44 @@ This package contains the development files for the library that can be used
for embedding devhelp into other applications such as IDEs.
%prep
%setup -q
%patch0 -p1 -b .covscan
%autosetup -p1 -n %{name}-%{tarball_version}
%build
%configure --disable-static --disable-Werror
make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
%meson \
%if 0%{?flatpak}
-Dflatpak_build=true \
%endif
-Dgtk_doc=true \
-Dplugin_gedit=true \
%{nil}
%meson_build
%install
%make_install
# Update the screenshot shown in the software center
#
# NOTE: It would be *awesome* if this file was pushed upstream.
#
# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
#
appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml \
https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/devhelp/a.png
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
%meson_install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/devhelp
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/gedit/plugins/__pycache__
%find_lang devhelp --with-gnome
%check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.desktop
%ldconfig_scriptlets libs
%files
%doc AUTHORS NEWS README
%license COPYING
%doc AUTHORS NEWS README.md
%license LICENSES/*
%{_bindir}/devhelp
%{_datadir}/applications/org.gnome.Devhelp.desktop
%{_datadir}/dbus-1/services/org.gnome.Devhelp.service
%{_datadir}/devhelp
%{_datadir}/icons/hicolor/16x16/apps/devhelp.png
%{_datadir}/icons/hicolor/22x22/apps/devhelp.png
%{_datadir}/icons/hicolor/24x24/apps/devhelp.png
%{_datadir}/icons/hicolor/32x32/apps/devhelp.png
%{_datadir}/icons/hicolor/48x48/apps/devhelp.png
%{_datadir}/icons/hicolor/256x256/apps/devhelp.png
%{_datadir}/icons/hicolor/symbolic/apps/devhelp-symbolic.svg
%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Devhelp.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Devhelp-symbolic.svg
%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
%dir %{_libdir}/gedit
@ -105,29 +96,98 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.
%{_mandir}/man1/devhelp.1*
%files libs -f devhelp.lang
%{_libdir}/libdevhelp-3.so.5*
%{_libdir}/libdevhelp-3.so.6*
%{_libdir}/girepository-1.0/Devhelp-3.0.typelib
%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.libdevhelp-3.gschema.xml
%files devel
%{_includedir}/devhelp-3.0/
%{_includedir}/devhelp-3/
%{_libdir}/libdevhelp-3.so
%{_libdir}/pkgconfig/*
%{_datadir}/gtk-doc/*
%{_datadir}/gir-1.0/Devhelp-3.0.gir
%changelog
* Wed Oct 31 2018 Tomas Popela <tpopela@redhat.com> - 1:3.28.1-5
- Add isa to requires
- Resolves: rhbz#1637781
* Fri Aug 27 2021 Kalev Lember <klember@redhat.com> - 1:40.1-1
- Update to 40.1
* Tue Oct 09 2018 Tomas Popela <tpopela@redhat.com> - 1:3.28.1-4
- Fix the Coverity scan issues
- Resolves: rhbz#1637781
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:40.0-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Oct 08 2018 Tomas Popela <tpopela@redhat.com> - 1:3.28.1-2
- Fix the requires/provides rpmdiff warning
- Resolves: rhbz#1637052
* Mon Jun 14 2021 Eike Rathke <erack@redhat.com> - 1:40.0-2
- Resolves: rhbz#1971430 Update license to GPLv3+
* Thu Apr 15 2021 Ray Strode <rstrode@redhat.com> - 1:40.0-1
- Update to 40.0
- Drop amtk dependency
Related: #1948445
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:40~alpha-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 1:40~alpha-1
- Update to 40.alpha
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.38.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 1:3.38.1-1
- Update to 3.38.1
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 1:3.38.0-1
- Update to 3.38.0
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.37.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 1:3.37.1-1
- Update to 3.37.1
* Sat Apr 25 2020 Kalev Lember <klember@redhat.com> - 1:3.36.2-1
- Update to 3.36.2
* Fri Mar 27 2020 Kalev Lember <klember@redhat.com> - 1:3.36.1-1
- Update to 3.36.1
* Thu Mar 05 2020 Kalev Lember <klember@redhat.com> - 1:3.36.0-1
- Update to 3.36.0
* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 1:3.35.90-1
- Update to 3.35.90
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.34.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 1:3.34.0-1
- Update to 3.34.0
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 1:3.32.0-1
- Update to 3.32.0
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.30.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Oct 31 2018 Kalev Lember <klember@redhat.com> - 1:3.30.1-2
- Fix typo that prevented macro expansion
* Fri Oct 26 2018 Kalev Lember <klember@redhat.com> - 1:3.30.1-1
- Update to 3.30.1
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1:3.30.0-2
- Rebuilt against fixed atk (#1626575)
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1:3.30.0-1
- Update to 3.30.0
- Switch to the meson build system
- Use upstream screenshots in appdata
- Drop ldconfig scriptlets
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.28.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 1:3.28.1-1
- Update to 3.28.1