This commit is contained in:
Peter Robinson 2014-06-16 20:31:42 +01:00
parent bc84941a33
commit 68e35ecf71
5 changed files with 8 additions and 105 deletions

9
.gitignore vendored
View File

@ -1,8 +1 @@
gource-0.27-beta1-20100710.tar.gz
gource-0.27.tar.gz
/gource-0.28.tar.gz
/gource-0.29.tar.gz
/gource-0.35.tar.gz
/gource-0.37.tar.gz
/gource-0.38.tar.gz
/gource-0.40.tar.gz
/gource-0.*.tar.gz

View File

@ -1,11 +0,0 @@
--- src/logmill.cpp~ 2012-04-19 20:52:29.000000000 -0500
+++ src/logmill.cpp 2012-11-09 07:35:18.407176102 -0600
@@ -176,7 +176,7 @@
logfile = repo_path.string();
}
}
- } catch(boost::filesystem3::filesystem_error& error) {
+ } catch(boost::filesystem::filesystem_error& error) {
}
}

View File

@ -1,76 +0,0 @@
diff --git a/home/siddhesh/src/fedora/gource/gource-0.37/src/core/utf8/checked.h b/src/core/utf8/checked.h
index 16bab4d..ce50c4f 100644
--- a/home/siddhesh/src/fedora/gource/gource-0.37/src/core/utf8/checked.h
+++ b/src/core/utf8/checked.h
@@ -65,6 +65,35 @@ namespace utf8
/// The library API - functions intended to be called by the users
+ template <typename octet_iterator>
+ octet_iterator append(uint32_t cp, octet_iterator result)
+ {
+ if (!internal::is_code_point_valid(cp))
+ throw invalid_code_point(cp);
+
+ if (cp < 0x80) // one octet
+ *(result++) = static_cast<uint8_t>(cp);
+ else if (cp < 0x800) { // two octets
+ *(result++) = static_cast<uint8_t>((cp >> 6) | 0xc0);
+ *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
+ }
+ else if (cp < 0x10000) { // three octets
+ *(result++) = static_cast<uint8_t>((cp >> 12) | 0xe0);
+ *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
+ *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
+ }
+ else if (cp <= internal::CODE_POINT_MAX) { // four octets
+ *(result++) = static_cast<uint8_t>((cp >> 18) | 0xf0);
+ *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f) | 0x80);
+ *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
+ *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
+ }
+ else
+ throw invalid_code_point(cp);
+
+ return result;
+ }
+
template <typename octet_iterator, typename output_iterator>
output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
{
@@ -104,35 +133,6 @@ namespace utf8
}
template <typename octet_iterator>
- octet_iterator append(uint32_t cp, octet_iterator result)
- {
- if (!internal::is_code_point_valid(cp))
- throw invalid_code_point(cp);
-
- if (cp < 0x80) // one octet
- *(result++) = static_cast<uint8_t>(cp);
- else if (cp < 0x800) { // two octets
- *(result++) = static_cast<uint8_t>((cp >> 6) | 0xc0);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else if (cp < 0x10000) { // three octets
- *(result++) = static_cast<uint8_t>((cp >> 12) | 0xe0);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else if (cp <= internal::CODE_POINT_MAX) { // four octets
- *(result++) = static_cast<uint8_t>((cp >> 18) | 0xf0);
- *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else
- throw invalid_code_point(cp);
-
- return result;
- }
-
- template <typename octet_iterator>
uint32_t next(octet_iterator& it, octet_iterator end)
{
uint32_t cp = 0;

View File

@ -1,12 +1,9 @@
Summary: Software version control visualization
Name: gource
Version: 0.40
Release: 5%{?dist}
Version: 0.42
Release: 1%{?dist}
URL: http://gource.googlecode.com/
Source: https://gource.googlecode.com/files/%{name}-%{version}.tar.gz
#Patch1: gource-build-fix.patch
#Patch2: gource-0.38-boost.patch
Source: https://github.com/acaudwell/Gource/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Applications/Productivity
@ -37,8 +34,6 @@ files and directories.
%prep
%setup -q
#% patch1 -p1
#%patch2 -p0
sed -i.cp -e 's|cp |cp -p |' Makefile.in
rm -r src/tinyxml
@ -51,7 +46,6 @@ make install DESTDIR=%{buildroot}
rm -rf %{buildroot}/%{_datadir}/%{name}/fonts
%files
%{_bindir}/gource
%{_mandir}/man1/gource.1.gz
%doc COPYING README THANKS ChangeLog
@ -60,6 +54,9 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/fonts
%{_datadir}/gource/*
%changelog
* Mon Jun 16 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.42-1
- New upstream 0.42
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.40-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

View File

@ -1 +1 @@
89c608a7aa3c901661eb1f2db6117492 gource-0.40.tar.gz
6ec113bcf6e5524ca175351c0530e08b gource-0.42.tar.gz