← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libproxy/oneiric-updates

« back to all changes in this revision

Viewing changes to debian/patches/libproxy_link_against_libdl.patch

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Emilio Pozuelo Monfort, Josselin Mouette
  • Date: 2010-10-19 08:46:05 UTC
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20101019084605-xzbg3sm5y4n7bwdw
Tags: 0.3.1-2
http://bugs.debian.org/600196
http://bugs.debian.org/597864
[ Emilio Pozuelo Monfort ]
* debian/patches/libproxy_link_against_libdl.patch:
  - Removed, configure.ac already adds the correct check so this is not
    needed anymore.

[ Josselin Mouette ]
* 01_pac_http.patch: new patch from Julien Blache. Don’t assume HTTP 
  header names are case sensitive. Closes: #600196.
* Re-enable webkit support. The build-dependency loop is not a problem 
  for a stable release. (But the issue will arise again later.)
* Recommend libwebkit-1.0-2 | libmozjs2d. Closes: #597864.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libproxy_link_against_libdl.patch
1
 
diff -ruNp libproxy-0.3.1.orig/src/lib/Makefile.am libproxy-0.3.1/src/lib/Makefile.am
2
 
--- libproxy-0.3.1.orig/src/lib/Makefile.am     2009-09-29 21:52:50.000000000 +0200
3
 
+++ libproxy-0.3.1/src/lib/Makefile.am  2009-12-12 01:27:11.000000000 +0100
4
 
@@ -11,7 +11,7 @@ libproxy_la_SOURCES = \
5
 
                                                url.c url.h
6
 
 
7
 
 libproxy_la_CFLAGS  = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
8
 
-libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
9
 
+libproxy_la_LDFLAGS = -lpthread -lm -ldl -no-undefined
10
 
 
11
 
 include_HEADERS     = proxy.h
12
 
 
13
 
diff -ruNp libproxy-0.3.1.orig/src/lib/Makefile.in libproxy-0.3.1/src/lib/Makefile.in
14
 
--- libproxy-0.3.1.orig/src/lib/Makefile.in     2009-10-08 21:23:57.000000000 +0200
15
 
+++ libproxy-0.3.1/src/lib/Makefile.in  2009-12-12 01:27:29.000000000 +0100
16
 
@@ -285,7 +285,7 @@ libproxy_la_SOURCES = \
17
 
                                                url.c url.h
18
 
 
19
 
 libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
20
 
-libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
21
 
+libproxy_la_LDFLAGS = -lpthread -lm -ldl -no-undefined
22
 
 include_HEADERS = proxy.h
23
 
 all: all-am
24