Codebase list libjxmpp-java / 930583f
d/patches: Update patches with gbp pq Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Sunil Mohan Adapa 2 years ago
1 changed file(s) with 54 addition(s) and 37 deletion(s). Raw diff Collapse all Expand all
+54
-37
debian/patches/01-edit-build-system.patch less more
0 From: Sunil Mohan Adapa <sunil@medhas.org>
1 Date: Sat, 1 May 2021 12:31:16 -0700
02 Subject: Alter gradle build file to suite Debian
1 The following build system functionality is disabled becase it is not needed
2 in Debian and simplifies packaging effort by not needed dependencies.
3 .
4 Error Prone and Animal Sniffer tools help upstream in avoiding errors and
5 ensuring compatibility with multple version of Java.
6 .
7 JMH is used for benchmarking.
8 .
9 Coveralls and Jacoco are needed for code coverage analysis and reporting that
10 upstream developers can use to increase number of tests.
11 .
12 Eclipse and Idea plugins are needed for generating project files that can be
13 opened in respective IDEs.
14 .
15 Disable tests until all the dependencies are packaged and they can be run
16 reliably.
17 .
18 libidn-java package does not provide metadata suitable for Debian's Maven
19 repository. Alter the build file to use the provided .jar instead.
20 .
21 Disable subprojects that have additional dependencies and focus on parts that
22 are needed for Smack and Jitsi.
23 Author: Sunil Mohan Adapa <sunil@medhas.org>
3
4 The following build system functionality is disabled because it is not needed in
5 Debian and simplifies packaging effort by not needed dependencies.
6
7 Error Prone and Animal Sniffer tools help upstream in avoiding errors and
8 ensuring compatibility with multiple version of Java.
9
10 JMH is used for benchmarking.
11
12 Coveralls and Jacoco are needed for code coverage analysis and reporting that
13 upstream developers can use to increase number of tests.
14
15 Eclipse and Idea plugins are needed for generating project files that can be
16 opened in respective IDEs.
17
18 Disable tests until all the dependencies are packaged and they can be run
19 reliably.
20
21 libidn-java package does not provide metadata suitable for Debian's Maven
22 repository.
23
24 Alter the build file to use the provided .jar instead.
25
26 Disable sub-projects that have additional dependencies and focus on parts that
27 are needed for Smack and Jitsi.
28
2429 Forwarded: not-needed
30 ---
31 build.gradle | 54 ++++++++++++++++++------------------
32 jxmpp-stringprep-libidn/build.gradle | 2 +-
33 settings.gradle | 8 +++---
34 3 files changed, 32 insertions(+), 32 deletions(-)
35
36 diff --git a/build.gradle b/build.gradle
37 index 194c9df..a3dadf3 100644
2538 --- a/build.gradle
2639 +++ b/build.gradle
27 @@ -6,22 +6,22 @@
40 @@ -6,22 +6,22 @@ buildscript {
2841 mavenCentral()
2942 }
3043
5669
5770 repositories {
5871 mavenLocal()
59 @@ -50,7 +50,7 @@
72 @@ -50,7 +50,7 @@ allprojects {
6073 junit4Projects = [
6174 ':jxmpp-core',
6275 ':jxmpp-jid',
6578 ':jxmpp-stringprep-icu4j',
6679 ':jxmpp-stringprep-libidn',
6780 ':jxmpp-util-cache',
68 @@ -79,11 +79,11 @@
81 @@ -79,11 +79,11 @@ allprojects {
6982 )
7083 }
7184
7992
8093 // Make all project's 'test' target depend on javadoc, so that
8194 // javadoc is also linted.
82 @@ -132,7 +132,7 @@
95 @@ -132,7 +132,7 @@ allprojects {
8396 options.charSet = "UTF-8"
8497 }
8598
88101 toolVersion = "0.8.3"
89102 }
90103
91 @@ -158,7 +158,7 @@
104 @@ -158,7 +158,7 @@ allprojects {
92105 events "failed"
93106 exceptionFormat "full"
94107 }
97110 }
98111
99112 task javadocAll(type: Javadoc) {
100 @@ -195,12 +195,12 @@
113 @@ -195,12 +195,12 @@ uploadArchives.enabled = false
101114 evaluationDependsOnChildren()
102115 subprojects {
103116 apply plugin: 'maven-publish'
115128 task sourcesJar(type: Jar, dependsOn: classes) {
116129 classifier = 'sources'
117130 from sourceSets.main.allSource
118 @@ -218,7 +218,7 @@
131 @@ -218,7 +218,7 @@ subprojects {
119132 testRuntime testsJar
120133 }
121134
124137 publications {
125138 mavenJava(MavenPublication) {
126139 from components.java
127 @@ -272,7 +272,7 @@
140 @@ -272,7 +272,7 @@ subprojects {
128141 }
129142 }
130143 }
133146 rootProject.distributionZip {
134147 dependsOn build
135148 from(buildDir) {
136 @@ -283,7 +283,7 @@
149 @@ -283,7 +283,7 @@ subprojects {
137150 // Workaround for gpg signatory not supporting the 'required' option
138151 // See https://github.com/gradle/gradle/issues/5064#issuecomment-381924984
139152 // Note what we use 'signing.gnupg.keyName' instead of 'signing.keyId'.
142155 onlyIf {
143156 project.hasProperty('signing.gnupg.keyName')
144157 }
145 @@ -292,10 +292,10 @@
158 @@ -292,10 +292,10 @@ subprojects {
146159 required { signingRequired }
147160 useGpgCmd()
148161 sign publishing.publications.mavenJava
155168 apply plugin: 'net.ltgt.errorprone'
156169
157170 tasks.withType(JavaCompile) {
158 @@ -319,7 +319,7 @@
171 @@ -319,7 +319,7 @@ configure (errorProneProjects) {
159172 errorprone 'com.google.errorprone:error_prone_core:2.3.3'
160173 errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
161174 }
164177
165178 dependencies {
166179 androidProjects.each { project ->
167 @@ -327,7 +327,7 @@
180 @@ -327,7 +327,7 @@ dependencies {
168181 }
169182 }
170183
173186 dependencies {
174187 testImplementation "junit:junit:4.12"
175188 testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVersion"
176 @@ -381,7 +381,7 @@
189 @@ -381,7 +381,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
177190 // the subprojects is wrong (e.g. a project is missing
178191 // in there).
179192 setOnlyIf { true }
182195
183196 def getGitCommit() {
184197 def projectDirFile = new File("$projectDir")
198 diff --git a/jxmpp-stringprep-libidn/build.gradle b/jxmpp-stringprep-libidn/build.gradle
199 index c507adb..d5ffa81 100644
185200 --- a/jxmpp-stringprep-libidn/build.gradle
186201 +++ b/jxmpp-stringprep-libidn/build.gradle
187 @@ -3,5 +3,5 @@
202 @@ -3,5 +3,5 @@ JXMPP Stringprep with libidn."""
188203
189204 dependencies {
190205 compile project(':jxmpp-core')
191206 - compile 'org.gnu.inet:libidn:1.15'
192207 + compile files('/usr/share/java/libidn.jar')
193208 }
209 diff --git a/settings.gradle b/settings.gradle
210 index ff18801..c408e49 100644
194211 --- a/settings.gradle
195212 +++ b/settings.gradle
196213 @@ -1,8 +1,8 @@